Changes between Version 9 and Version 10 of MakingRelease

Timestamp:

09/10/08 16:24:40 (16 years ago)

Author:

Alpar Juttner

Comment:

--

MakingRelease

@@ -37 +37 @@
 == Bugfix Changesets ==
  
- - Do the bugfix on the top of the common ancestor changeset of all branches where the bug appears (e.g. on the top of '''1.0-base''').
+ - Do the bugfix on the top of the common ancestor changeset of all branches where the bug appears. This changeset can be found with the {{{debuganchestor}}} command like this.
+   {{{
+hg debugancestor default 1.0
+   }}}
  - Then merge them individually to all branches where it applies.
+   - '''Important:''' Update to the branch head first, then merge to the bugfix changeset, otherwise the the merge commit will not belong to the branch.
+     {{{
+hg up -C 1.0
+hg merge -r 1234
+hg ci -m 'Merge to 1.0'
+     }}}
 
 == Bugfix Releases ==