Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.2, 0.8.3, and 0.9

stable doc: improve Working with your repository in quick tour

Changeset d85dbf2a1307…

Parent 719d2249442a…

by Giampaolo Fadel

Changes to one file · Browse files at d85dbf2a1307 Showing diff from parent 719d2249442a Diff from another changeset...

Change 1 of 2 Show Entire File doc/​source/​quick.txt Stacked
 
106
107
108
109
 
 
110
111
112
 
162
163
164
165
166
167
168
169
170
171
172
173
174
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
175
176
177
 
106
107
108
 
109
110
111
112
113
 
163
164
165
 
 
166
167
168
 
 
 
 
 
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
@@ -106,7 +106,8 @@
 (the message or the selected files) you can cancel the last commit using the  :guilabel:`Undo` button.   -.. {{images/image001.png}} +.. figure:: figures/commit.png + :alt: Commit dialog    Share the repository  ==================== @@ -162,16 +163,24 @@
 visual difference tool (kdiff). You may commit many times before  synchronizing with the group repository.   -.. figure:: figures/commit.png - :alt: Commit dialog    When you're ready to publish your changes, you   -1. commit your changes to your local repository, if you haven't already. -2. pull changes from the group repository into your repository -3. merge and commit into your local repository -4. make sure your work still builds and passes your extensive test suite -5. push your changes to the group repository. +1. commit your changes to your local repository, if you haven't already + (see above). +2. pull changes from the group repository into your repository, + :menuselection:`TortoiseHg --> Synchronize` or + :command:`hgtk synch`, choose the source path to group repository + and then :guilabel:`Pull`. +3. if some changesets are pulled, merge then and commit into your local + repository. From the changelog viewer (:menuselection:`TortoiseHg --> View Changelog` + or :command:`hgtk log`) open the context menu over the changeset which + you want to merge with and select :guilabel:`merge with`. Finally, in the + merge dialog, press :guilabel:`Merge` and then :guilabel:`Commit`. +4. make sure your work still builds and passes your extensive test suite. +5. push your changes to the group repository, :menuselection:`TortoiseHg --> Synchronize` + or :command:`hgtk synch`, choose the source path to group repository + and then :guilabel:`Push`.    Which may sound complicated, but it is just pushing the buttons on the  synchronize tool.