Mercurial > hg

comparison tests/test-backout.out @ 6161:bc1ba9124799

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reverse the way backout is doing the merge Currently, backout is creating a backout revision as a child node of the backed out node and will leave you at this new head. This has several drawbacks: * this changes the current head * when there is a long history between the backed out node and the current head, this will generate a huge number of diffs that are scary at first sight, and not very natural to review before commit. The change consists to switch back to the original node as soon as the backout node (which becomes the new tip) has been created. Then the --merge option can just merge this new tip in the current node. * the current head/node is not changed from the user's point of view * even without using the --merge option, the backout revision is still easy to locate, as this is the tip * the merge is much more intuitive as diffs of the merge is right you are looking to backout
author Gilles Moris <gilles.moris@free.fr>
date Thu, 21 Feb 2008 08:52:52 +0100
parents de620356064f
children 554715e584e6
comparison
equal deleted inserted replaced
6160:3ee3bc5d06c5 6161:bc1ba9124799
23 adding c 23 adding c
24 abort: cannot back out change on a different branch 24 abort: cannot back out change on a different branch
25 # backout with merge 25 # backout with merge
26 adding a 26 adding a
27 reverting a 27 reverting a
28 changeset 3:3eb045e364a4 backs out changeset 1:314f55b1bf23 28 changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182
29 merging with changeset 2:b66ea5b77abb 29 merging with changeset 3:26b8ccb9ad91
30 merging a 30 merging a
31 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 31 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
32 (branch merge, don't forget to commit) 32 (branch merge, don't forget to commit)
33 line 1 33 line 1
34 line 2
35 line 3
34 # backout should not back out subsequent changesets 36 # backout should not back out subsequent changesets
35 adding a 37 adding a
36 adding b 38 adding b
37 reverting a 39 reverting a
38 changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5 40 changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5
39 the backout changeset is a new head - do not forget to merge 41 the backout changeset is a new head - do not forget to merge
40 (use "backout --merge" if you want to auto-merge) 42 (use "backout --merge" if you want to auto-merge)
43 b
44 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
41 adding a 45 adding a
42 adding b 46 adding b
43 adding c 47 adding c
44 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 48 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
45 adding d 49 adding d