/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/en/user-guide/merging_changes.txt

  • Committer: John Arbash Meinel
  • Date: 2008-08-07 22:26:48 UTC
  • mto: This revision was merged to the branch mainline in revision 3614.
  • Revision ID: john@arbash-meinel.com-20080807222648-ako39zeldqibnk40
Fix the merge_sort code so that it properly increments.
We had a small bug where if you had branches descend from new
roots, as well as sub-branches within them, the branch counter
would skip, and then repeat itself. (the root was a post-increment,
while sub-branches were pre-increment.)
This changes both to be pre-increment.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/merging_changes.txt
53
53
 
54
54
Note that some merges can only be completed with the assistance
55
55
of a human. Details on how to resolve these are given in
56
 
`Resolving conflicts <resolving_conflicts.html>`_.
 
56
`Resolving conflicts`_.
57
57
 
58
58
Recording a merge
59
59
-----------------