Show More
@@ -177,10 +177,8 b' def backout(ui, repo, node=None, rev=Non' | |||||
177 | changeset is a child of the backed out changeset. |
|
177 | changeset is a child of the backed out changeset. | |
178 |
|
178 | |||
179 | If you back out a changeset other than the tip, a new head is |
|
179 | If you back out a changeset other than the tip, a new head is | |
180 | created. This head is the parent of the working directory. If |
|
180 | created. This head will be the new tip and you should merge this | |
181 | you back out an old changeset, your working directory will appear |
|
181 | backout changeset with another head (current one by default). | |
182 | old after the backout. You should merge the backout changeset |
|
|||
183 | with another head. |
|
|||
184 |
|
182 | |||
185 | The --merge option remembers the parent of the working directory |
|
183 | The --merge option remembers the parent of the working directory | |
186 | before starting the backout, then merges the new head with that |
|
184 | before starting the backout, then merges the new head with that | |
@@ -243,9 +241,10 b' def backout(ui, repo, node=None, rev=Non' | |||||
243 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
241 | ui.status(_('changeset %s backs out changeset %s\n') % | |
244 | (nice(repo.changelog.tip()), nice(node))) |
|
242 | (nice(repo.changelog.tip()), nice(node))) | |
245 | if op1 != node: |
|
243 | if op1 != node: | |
|
244 | hg.clean(repo, op1, show_stats=False) | |||
246 | if opts['merge']: |
|
245 | if opts['merge']: | |
247 |
ui.status(_('merging with changeset %s\n') % nice( |
|
246 | ui.status(_('merging with changeset %s\n') % nice(repo.changelog.tip())) | |
248 |
hg.merge(repo, hex( |
|
247 | hg.merge(repo, hex(repo.changelog.tip())) | |
249 | else: |
|
248 | else: | |
250 | ui.status(_('the backout changeset is a new head - ' |
|
249 | ui.status(_('the backout changeset is a new head - ' | |
251 | 'do not forget to merge\n')) |
|
250 | 'do not forget to merge\n')) |
@@ -59,9 +59,10 b' hg init merge' | |||||
59 | cd merge |
|
59 | cd merge | |
60 |
|
60 | |||
61 | echo line 1 > a |
|
61 | echo line 1 > a | |
|
62 | echo line 2 >> a | |||
62 | hg commit -d '0 0' -A -m a |
|
63 | hg commit -d '0 0' -A -m a | |
63 |
|
64 | # remove line 1 | ||
64 |
echo line 2 > |
|
65 | echo line 2 > a | |
65 | hg commit -d '1 0' -m b |
|
66 | hg commit -d '1 0' -m b | |
66 |
|
67 | |||
67 | echo line 3 >> a |
|
68 | echo line 3 >> a | |
@@ -69,6 +70,7 b" hg commit -d '2 0' -m c" | |||||
69 |
|
70 | |||
70 | hg backout --merge -d '3 0' 1 |
|
71 | hg backout --merge -d '3 0' 1 | |
71 | hg commit -d '4 0' -m d |
|
72 | hg commit -d '4 0' -m d | |
|
73 | # check line 1 is back | |||
72 | cat a |
|
74 | cat a | |
73 |
|
75 | |||
74 | echo '# backout should not back out subsequent changesets' |
|
76 | echo '# backout should not back out subsequent changesets' | |
@@ -82,6 +84,8 b' echo 1 > b' | |||||
82 | hg commit -d '2 0' -A -m c |
|
84 | hg commit -d '2 0' -A -m c | |
83 | hg backout -d '3 0' 1 |
|
85 | hg backout -d '3 0' 1 | |
84 | hg locate b |
|
86 | hg locate b | |
|
87 | hg update -C tip | |||
|
88 | hg locate b | |||
85 |
|
89 | |||
86 | cd .. |
|
90 | cd .. | |
87 | hg init m |
|
91 | hg init m |
@@ -25,12 +25,14 b' abort: cannot back out change on a diffe' | |||||
25 | # backout with merge |
|
25 | # backout with merge | |
26 | adding a |
|
26 | adding a | |
27 | reverting a |
|
27 | reverting a | |
28 |
changeset 3: |
|
28 | changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182 | |
29 |
merging with changeset |
|
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 | |
@@ -38,6 +40,8 b' 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 |
@@ -1,6 +1,6 b'' | |||||
1 | reverting a |
|
1 | reverting a | |
2 | changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8 |
|
2 | changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8 | |
3 |
merging with changeset |
|
3 | merging with changeset 3:107ce1ee2b43 | |
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 | (branch merge, don't forget to commit) |
|
5 | (branch merge, don't forget to commit) | |
6 | abort: invalid date: 'should fail' |
|
6 | abort: invalid date: 'should fail' |
General Comments 0
You need to be logged in to leave comments.
Login now