Mercurial > hg
annotate tests/test-backout.out @ 6161:bc1ba9124799
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 |
rev | line source |
---|---|
4726
f6e961c0155b
Fix and test 'hg backout' without or with too many revisions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4718
diff
changeset
|
1 # should complain |
f6e961c0155b
Fix and test 'hg backout' without or with too many revisions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4718
diff
changeset
|
2 abort: please specify a revision to backout |
f6e961c0155b
Fix and test 'hg backout' without or with too many revisions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4718
diff
changeset
|
3 abort: please specify just one revision |
2158 | 4 # basic operation |
5 adding a | |
2407
8fe3d60b7f19
revert: better fix for not printing 'reverting' message
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2303
diff
changeset
|
6 reverting a |
4718
934275cd4526
backout: report short hash in commit message
Matt Mackall <mpm@selenic.com>
parents:
4195
diff
changeset
|
7 changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57 |
2158 | 8 a |
9 # file that was removed is recreated | |
10 adding a | |
11 adding a | |
4718
934275cd4526
backout: report short hash in commit message
Matt Mackall <mpm@selenic.com>
parents:
4195
diff
changeset
|
12 changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372 |
2158 | 13 content |
14 # backout of backout is as if nothing happened | |
15 removing a | |
4718
934275cd4526
backout: report short hash in commit message
Matt Mackall <mpm@selenic.com>
parents:
4195
diff
changeset
|
16 changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d |
2158 | 17 cat: a: No such file or directory |
5568
de620356064f
backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents:
4726
diff
changeset
|
18 # across branch |
de620356064f
backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents:
4726
diff
changeset
|
19 adding a |
de620356064f
backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents:
4726
diff
changeset
|
20 adding b |
de620356064f
backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents:
4726
diff
changeset
|
21 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
de620356064f
backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents:
4726
diff
changeset
|
22 abort: cannot back out change on a different branch |
de620356064f
backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents:
4726
diff
changeset
|
23 adding c |
de620356064f
backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents:
4726
diff
changeset
|
24 abort: cannot back out change on a different branch |
2158 | 25 # backout with merge |
26 adding a | |
2407
8fe3d60b7f19
revert: better fix for not printing 'reverting' message
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2303
diff
changeset
|
27 reverting a |
6161
bc1ba9124799
Reverse the way backout is doing the merge
Gilles Moris <gilles.moris@free.fr>
parents:
5568
diff
changeset
|
28 changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182 |
bc1ba9124799
Reverse the way backout is doing the merge
Gilles Moris <gilles.moris@free.fr>
parents:
5568
diff
changeset
|
29 merging with changeset 3:26b8ccb9ad91 |
2158 | 30 merging a |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2158
diff
changeset
|
31 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2158
diff
changeset
|
32 (branch merge, don't forget to commit) |
2158 | 33 line 1 |
6161
bc1ba9124799
Reverse the way backout is doing the merge
Gilles Moris <gilles.moris@free.fr>
parents:
5568
diff
changeset
|
34 line 2 |
bc1ba9124799
Reverse the way backout is doing the merge
Gilles Moris <gilles.moris@free.fr>
parents:
5568
diff
changeset
|
35 line 3 |
2492 | 36 # backout should not back out subsequent changesets |
37 adding a | |
38 adding b | |
39 reverting a | |
4718
934275cd4526
backout: report short hash in commit message
Matt Mackall <mpm@selenic.com>
parents:
4195
diff
changeset
|
40 changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5 |
2493
9c660e691e90
print message after backout that tells that backout adds new head.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2492
diff
changeset
|
41 the backout changeset is a new head - do not forget to merge |
2769
2ace3bf43089
tests: fix output for test-backout
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2619
diff
changeset
|
42 (use "backout --merge" if you want to auto-merge) |
6161
bc1ba9124799
Reverse the way backout is doing the merge
Gilles Moris <gilles.moris@free.fr>
parents:
5568
diff
changeset
|
43 b |
bc1ba9124799
Reverse the way backout is doing the merge
Gilles Moris <gilles.moris@free.fr>
parents:
5568
diff
changeset
|
44 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2619
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
45 adding a |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
46 adding b |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
47 adding c |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
48 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
49 adding d |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
51 (branch merge, don't forget to commit) |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
52 # backout of merge should fail |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
53 abort: cannot back out a merge changeset without --parent |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
54 # backout of merge with bad parent should fail |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
55 abort: cb9a9f314b8b is not a parent of b2f3bb92043e |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
56 # backout of non-merge with parent should fail |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
57 abort: cannot use --parent on non-merge changeset |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
58 # backout with valid parent should be ok |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
59 removing d |
4718
934275cd4526
backout: report short hash in commit message
Matt Mackall <mpm@selenic.com>
parents:
4195
diff
changeset
|
60 changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e |
2619
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
61 rolling back last transaction |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fc0ec2b64150
update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2493
diff
changeset
|
63 removing c |
4718
934275cd4526
backout: report short hash in commit message
Matt Mackall <mpm@selenic.com>
parents:
4195
diff
changeset
|
64 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e |