Show More
@@ -48,4 +48,16 b" hg backout --merge -d '3 0' 1" | |||||
48 | hg commit -d '4 0' -m d |
|
48 | hg commit -d '4 0' -m d | |
49 | cat a |
|
49 | cat a | |
50 |
|
50 | |||
|
51 | echo '# backout should not back out subsequent changesets' | |||
|
52 | hg init onecs | |||
|
53 | cd onecs | |||
|
54 | echo 1 > a | |||
|
55 | hg commit -d '0 0' -A -m a | |||
|
56 | echo 2 >> a | |||
|
57 | hg commit -d '1 0' -m b | |||
|
58 | echo 1 > b | |||
|
59 | hg commit -d '2 0' -A -m c | |||
|
60 | hg backout -d '3 0' 1 | |||
|
61 | hg locate b | |||
|
62 | ||||
51 | exit 0 |
|
63 | exit 0 |
@@ -21,3 +21,9 b' merging a' | |||||
21 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
21 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
22 | (branch merge, don't forget to commit) |
|
22 | (branch merge, don't forget to commit) | |
23 | line 1 |
|
23 | line 1 | |
|
24 | # backout should not back out subsequent changesets | |||
|
25 | adding a | |||
|
26 | adding b | |||
|
27 | reverting a | |||
|
28 | changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5 | |||
|
29 | b |
General Comments 0
You need to be logged in to leave comments.
Login now