Mercurial > dive4elements > river

annotate artifacts/doc/howto_commit_windows.txt @ 9751:308a0d822d18 3.2.x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Keep configuration and data in distinct directories This allows having distinct volumes for configuration and data (artifact database, generated mapfiles and shapefiles, etc.). While at it, cleanup MapServer configuration a little bit.
author Tom Gottfried <tom@intevation.de>
date Tue, 11 Oct 2022 11:42:09 +0200
parents 819528f6fabb
children
rev   line source
7749
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
1 Diese Anleitung erklärt wie man Änderungen an der Codebasis von
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
2 D4E-River unter Windows durchführen kann. In dieser Anleitung
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
3 wird dazu TortoiseHg und Putty verwendet.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
4
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
5 Hintergrund:
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
6 D4E-River wird mit dem Versionskontrollsystem Mercurial
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
7 ( http://de.wikipedia.org/wiki/Mercurial ) verwaltet und ist auf
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
8 der Plattform "Wald" ( http://wald.intevation.org/ ) gehostet.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
9 TortoiseHg ist eine Windows Explorer Erweiterung um ein graphisches
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
10 Frontend für Mercurial zu bieten.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
11
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
12
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
13 Schritte 1-3 sind einmalig auszuführen. Schritt 4 muss immer wenn
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
14 man eine Änderung durchführen möchte geschehen.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
15
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
16 Schritt 1: Registrieren eines Benutzerkontos auf wald.intevation.de
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
17
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
18 * Browser öffnen auf Seite https://www.wald.intevation.org/account/register.php
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
19 Das zugehörige Wurzelzertifikat kann unter https://ssl.intevation.de
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
20 (Root CA 2010) beschafft werden.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
21 * Accountdetails eintragen (Nur Felder mit * müssen beachtet werden)
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
22 * Registrieren drücken.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
23 -> Ihnen wird eine E-Mail mit einem Link zur Bestätigung gesendet.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
24 * Link aus der E-Mail öffnen.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
25 * Unter: https://wald.intevation.org/projects/dive4elements/ einen Beitrittsgesuch
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
26 (Link dafür ist Rechts unten auf der Seite unter den Mitgliedern)
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
27 Knappen Kommentar einfügen: "Beitrittsgesuch Frau Mustermann" o.Ä.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
28 -> Ein Admin in diesem Projekt muss Sie nun manuell freischalten.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
29
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
30 Schritt 2: SSH Schlüssel erstellen und in Wald hinterlegen
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
31
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
32 (Dieser Teil geht davon aus das Putty bereits installiert ist)
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
33 * Puttygen starten
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
34 * "Generate a public/private key pair" Ausführen
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
35 * ggf. Einen Key Comment z.B. "Wald Schluessel" angeben.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
36 * ggf. Eine passphrase angeben
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
37 * Save private key -> Schlüssel abspeichern z.B: c:\Benutzer\name\wald-schluessel.ppk
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
38 * Save public key -> Öffentlichen Schlüssel abspeichern z.B: c:\Benutzer\name\wald-schluessel-pub.txt
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
39 * Kopieren Sie den Inhalt des Bereichs "Public key for pasting into OpenSSH authorized_keys file:"
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
40 * Fügen Sie den öffentlichen Schlüssel in dem Eingabefeld unter:
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
41 http://wald.intevation.org/account/editsshkeys.php
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
42 ein.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
43 * Speichern des Schlüssels durch drücken auf den Button "Aktualisierung".
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
44
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
45 ! Achtung: Es kann bis zu einer Stunde dauern bis der Schlüssel im System
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
46 synchronisiert ist.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
47
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
48
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
49 Schritt 3: TortoiseHg (Software zur Versionskontrolle) installieren
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
50 * Unter: http://tortoisehg.bitbucket.org/ TortoiseHg herunterladen
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
51 Die passende Version hängt von der Architektur ihres Systems (32/64-Bit ab)
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
52 * TortoiseHg installieren. Die Standardoptionen sind ausreichend.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
53 * Fügen Sie nun den Privaten Schlüssel den Sie in Schritt 2 generiert haben
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
54 in Pageant ein.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
55 (Wenn Pageant noch nicht installiert ist kann auch der Pageant aus TortoiseHg
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
56 verwendet werden. z.B. Installiert in (C:\Programme\TortoiseHg\Pageant.exe)
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
57 * Navigieren Sie im Windows Explorer in ein Verzeichnis in welchem
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
58 das D4E-River Repository angelegt werden soll.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
59 * Rechtsklick im Windows Explorer zeigt nun neue Kontext Optionen für TortoiseHg.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
60 TortoiseHg -> clone
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
61 * Tragen Sie als Quelle ssh://<ihrbenutzername>@scm.wald.intevation.org/hg/dive4elements/river/
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
62 ein. Als Ziel einen Ordnernamen für ihr Lokales Repository.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
63 -> Bei der ersten Verbindung werden Sie darauf hingewiesen das der Host Key des Servers
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
64 noch unbekannt ist. Der RSA Fingerprint von Wald ist:
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
65 24:d2:13:1f:fa:02:54:f1:79:4f:5d:a0:aa:d3:ed
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
66
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
67 Tritt kein Fehler auf haben Sie nun einen Authentifizierten Klon des D4E-River
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
68 Repositories.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
69
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
70
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
71 Schritt 4: Änderungen durchführen.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
72 * Sicherstellen das Pageant gestartet ist und den Key enthält.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
73 * Aktualisieren der lokalen Kopie im Ordner des Repositories
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
74 - Rechtsklick -> TortoiseHg -> Synchronize
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
75 - Auswählen "Nach dem Abfurfen" -> Update
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
76 - Eingehende Änderungen von der ausgewählten URL abrufen
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
77 * Änderungen an den Dateien durchführen.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
78 * Rechtsklick auf die geänderte Datei -> Hg Commit...
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
79 * Eine Versionsmeldung im Fenster die knapp zusammenfasst was / warum
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
80 Sie etwas geändert haben. (Am liebsten in Englisch)
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
81 z.B.: "Corrected usage of the word 'fixation' in english translations"
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
82 * Änderungen zum Server übertragen
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
83 - Rechtsklick -> TortoiseHg -> Synchronize
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
84 - Ausgehende Änderungen an die ausgewählte URL übertragen
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
85
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
86 Hinweis: Beim ersten "Commit" werden Sie gebeten sich zu Identifizieren.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
87 Im darauffolgenden Einstellungs Fenster müssen Sie dann einen Benutzernamen
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
88 Angeben. Dieser sollte das Format vorname nachname <email> haben.
819528f6fabb Add german howto to describe how to set up putty / wald and mercurial on windows
Andre Heinecke <aheinecke@intevation.de>
parents:
diff changeset
89 z.B.: Andre Heinecke <aheinecke@intevation.de>
http://dive4elements.wald.intevation.org