Show More
@@ -18,7 +18,7 b' from mercurial import hg, util, repair, ' | |||||
18 | from mercurial import extensions, patch, scmutil, phases, obsolete, error |
|
18 | from mercurial import extensions, patch, scmutil, phases, obsolete, error | |
19 | from mercurial import copies |
|
19 | from mercurial import copies | |
20 | from mercurial.commands import templateopts |
|
20 | from mercurial.commands import templateopts | |
21 | from mercurial.node import nullrev, nullid, hex |
|
21 | from mercurial.node import nullrev, nullid, hex, short | |
22 | from mercurial.lock import release |
|
22 | from mercurial.lock import release | |
23 | from mercurial.i18n import _ |
|
23 | from mercurial.i18n import _ | |
24 | import os, errno |
|
24 | import os, errno | |
@@ -367,9 +367,16 b' def rebase(ui, repo, **opts):' | |||||
367 | total = len(sortedstate) |
|
367 | total = len(sortedstate) | |
368 | pos = 0 |
|
368 | pos = 0 | |
369 | for rev in sortedstate: |
|
369 | for rev in sortedstate: | |
|
370 | ctx = repo[rev] | |||
|
371 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, | |||
|
372 | ctx.description().split('\n', 1)[0]) | |||
|
373 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) | |||
|
374 | if names: | |||
|
375 | desc += ' (%s)' % ' '.join(names) | |||
370 | pos += 1 |
|
376 | pos += 1 | |
371 | if state[rev] == revtodo: |
|
377 | if state[rev] == revtodo: | |
372 |
ui. |
|
378 | ui.status(_('rebasing %s\n') % desc) | |
|
379 | ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)), | |||
373 | _('changesets'), total) |
|
380 | _('changesets'), total) | |
374 | p1, p2, base = defineparents(repo, rev, target, state, |
|
381 | p1, p2, base = defineparents(repo, rev, target, state, | |
375 | targetancestors) |
|
382 | targetancestors) | |
@@ -410,6 +417,13 b' def rebase(ui, repo, **opts):' | |||||
410 | ui.debug('next revision set to %s\n' % p1) |
|
417 | ui.debug('next revision set to %s\n' % p1) | |
411 | skipped.add(rev) |
|
418 | skipped.add(rev) | |
412 | state[rev] = p1 |
|
419 | state[rev] = p1 | |
|
420 | elif state[rev] == nullmerge: | |||
|
421 | pass | |||
|
422 | elif state[rev] == revignored: | |||
|
423 | ui.status(_('not rebasing ignored %s\n') % desc) | |||
|
424 | else: | |||
|
425 | ui.status(_('already rebased %s as %s\n') % | |||
|
426 | (desc, repo[state[rev]])) | |||
413 |
|
427 | |||
414 | ui.progress(_('rebasing'), None) |
|
428 | ui.progress(_('rebasing'), None) | |
415 | ui.note(_('rebase merging completed\n')) |
|
429 | ui.note(_('rebase merging completed\n')) |
@@ -37,6 +37,7 b' bookmark list' | |||||
37 | rebase |
|
37 | rebase | |
38 |
|
38 | |||
39 | $ hg rebase -s two -d one |
|
39 | $ hg rebase -s two -d one | |
|
40 | rebasing 3:2ae46b1d99a7 "3" (tip two) | |||
40 | saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-backup.hg (glob) |
|
41 | saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-backup.hg (glob) | |
41 |
|
42 | |||
42 | $ hg log |
|
43 | $ hg log |
@@ -146,6 +146,7 b' Test that rewriting leaving instability ' | |||||
146 | stabilise |
|
146 | stabilise | |
147 |
|
147 | |||
148 | $ hg rebase -r 'unstable()' -d . |
|
148 | $ hg rebase -r 'unstable()' -d . | |
|
149 | rebasing 9:c13eb81022ca "f" | |||
149 | $ hg up tip -q |
|
150 | $ hg up tip -q | |
150 |
|
151 | |||
151 | Test dropping of changeset on the top of the stack |
|
152 | Test dropping of changeset on the top of the stack |
@@ -207,6 +207,8 b' automated commit like rebase/transplant' | |||||
207 | $ hg commit -m '#4' |
|
207 | $ hg commit -m '#4' | |
208 |
|
208 | |||
209 | $ hg rebase -s 1 -d 2 --keep |
|
209 | $ hg rebase -s 1 -d 2 --keep | |
|
210 | rebasing 1:72518492caa6 "#1" | |||
|
211 | rebasing 4:07d6153b5c04 "#4" (tip) | |||
210 | #if windows |
|
212 | #if windows | |
211 | $ hg status -A large1 |
|
213 | $ hg status -A large1 | |
212 | large1: * (glob) |
|
214 | large1: * (glob) | |
@@ -495,6 +497,7 b' it is aborted by conflict.' | |||||
495 | $ hg rebase -s 1 -d 3 --keep --config ui.interactive=True <<EOF |
|
497 | $ hg rebase -s 1 -d 3 --keep --config ui.interactive=True <<EOF | |
496 | > o |
|
498 | > o | |
497 | > EOF |
|
499 | > EOF | |
|
500 | rebasing 1:72518492caa6 "#1" | |||
498 | largefile large1 has a merge conflict |
|
501 | largefile large1 has a merge conflict | |
499 | ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
|
502 | ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 | |
500 | keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
|
503 | keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or | |
@@ -518,6 +521,8 b' the 1st commit of resuming.' | |||||
518 | $ hg rebase --continue --config ui.interactive=True <<EOF |
|
521 | $ hg rebase --continue --config ui.interactive=True <<EOF | |
519 | > c |
|
522 | > c | |
520 | > EOF |
|
523 | > EOF | |
|
524 | rebasing 1:72518492caa6 "#1" | |||
|
525 | rebasing 4:07d6153b5c04 "#4" | |||
521 | local changed .hglf/large1 which remote deleted |
|
526 | local changed .hglf/large1 which remote deleted | |
522 | use (c)hanged version or (d)elete? c |
|
527 | use (c)hanged version or (d)elete? c | |
523 |
|
528 |
@@ -1173,6 +1173,7 b' rebased or not.' | |||||
1173 | adding file changes |
|
1173 | adding file changes | |
1174 | added 1 changesets with 2 changes to 2 files (+1 heads) |
|
1174 | added 1 changesets with 2 changes to 2 files (+1 heads) | |
1175 | 0 largefiles cached |
|
1175 | 0 largefiles cached | |
|
1176 | rebasing 8:f574fb32bb45 "modify normal file largefile in repo d" | |||
1176 | Invoking status precommit hook |
|
1177 | Invoking status precommit hook | |
1177 | M sub/normal4 |
|
1178 | M sub/normal4 | |
1178 | M sub2/large6 |
|
1179 | M sub2/large6 | |
@@ -1230,6 +1231,7 b' rebased or not.' | |||||
1230 | added 1 changesets with 2 changes to 2 files (+1 heads) |
|
1231 | added 1 changesets with 2 changes to 2 files (+1 heads) | |
1231 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1232 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
1232 | $ hg rebase |
|
1233 | $ hg rebase | |
|
1234 | rebasing 8:f574fb32bb45 "modify normal file largefile in repo d" | |||
1233 | Invoking status precommit hook |
|
1235 | Invoking status precommit hook | |
1234 | M sub/normal4 |
|
1236 | M sub/normal4 | |
1235 | M sub2/large6 |
|
1237 | M sub2/large6 |
@@ -61,6 +61,8 b'' | |||||
61 | Conflicting rebase: |
|
61 | Conflicting rebase: | |
62 |
|
62 | |||
63 | $ hg rebase -s 3 -d 2 |
|
63 | $ hg rebase -s 3 -d 2 | |
|
64 | rebasing 3:3163e20567cc "L1" | |||
|
65 | rebasing 4:46f0b057b5c0 "L2" (tip) | |||
64 | merging common |
|
66 | merging common | |
65 | warning: conflicts during merge. |
|
67 | warning: conflicts during merge. | |
66 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
68 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -89,6 +91,8 b' forgotten) by Mercurial earlier than 2.7' | |||||
89 | earlier than 2.7 by renaming ".hg/rebasestate" temporarily. |
|
91 | earlier than 2.7 by renaming ".hg/rebasestate" temporarily. | |
90 |
|
92 | |||
91 | $ hg rebase -s 3 -d 2 |
|
93 | $ hg rebase -s 3 -d 2 | |
|
94 | rebasing 3:3163e20567cc "L1" | |||
|
95 | rebasing 4:46f0b057b5c0 "L2" (tip) | |||
92 | merging common |
|
96 | merging common | |
93 | warning: conflicts during merge. |
|
97 | warning: conflicts during merge. | |
94 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
98 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -157,6 +161,8 b' Rebase and abort without generating new ' | |||||
157 | o 0:public 'A' |
|
161 | o 0:public 'A' | |
158 |
|
162 | |||
159 | $ hg rebase -b 4 -d 2 |
|
163 | $ hg rebase -b 4 -d 2 | |
|
164 | rebasing 3:a6484957d6b9 "B bis" | |||
|
165 | rebasing 4:145842775fec "C1" (tip) | |||
160 | merging c |
|
166 | merging c | |
161 | warning: conflicts during merge. |
|
167 | warning: conflicts during merge. | |
162 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
168 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -216,6 +222,7 b' rebase abort should not leave working co' | |||||
216 |
|
222 | |||
217 |
|
223 | |||
218 | $ hg rebase -d master -r foo |
|
224 | $ hg rebase -d master -r foo | |
|
225 | rebasing 3:6c0f977a22d8 "C" (tip foo) | |||
219 | merging c |
|
226 | merging c | |
220 | warning: conflicts during merge. |
|
227 | warning: conflicts during merge. | |
221 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
228 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
@@ -74,6 +74,7 b' Test deleting divergent bookmarks from d' | |||||
74 | o 0: 'A' bookmarks: Y@diverge |
|
74 | o 0: 'A' bookmarks: Y@diverge | |
75 |
|
75 | |||
76 | $ hg rebase -s Y -d 3 |
|
76 | $ hg rebase -s Y -d 3 | |
|
77 | rebasing 2:49cb3485fa0c "C" (Y Z) | |||
77 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-backup.hg (glob) |
|
78 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-backup.hg (glob) | |
78 |
|
79 | |||
79 | $ hg tglog |
|
80 | $ hg tglog | |
@@ -95,6 +96,7 b' Do not try to keep active but deleted di' | |||||
95 | $ hg book W@diverge |
|
96 | $ hg book W@diverge | |
96 |
|
97 | |||
97 | $ hg rebase -s W -d . |
|
98 | $ hg rebase -s W -d . | |
|
99 | rebasing 3:41acb9dca9eb "D" (tip W) | |||
98 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-backup.hg (glob) |
|
100 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-backup.hg (glob) | |
99 |
|
101 | |||
100 | $ hg bookmarks |
|
102 | $ hg bookmarks | |
@@ -112,6 +114,8 b' Keep bookmarks to the correct rebased ch' | |||||
112 | $ hg up -q Z |
|
114 | $ hg up -q Z | |
113 |
|
115 | |||
114 | $ hg rebase -s 1 -d 3 |
|
116 | $ hg rebase -s 1 -d 3 | |
|
117 | rebasing 1:6c81ed0049f8 "B" (X) | |||
|
118 | rebasing 2:49cb3485fa0c "C" (Y Z) | |||
115 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-backup.hg (glob) |
|
119 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-backup.hg (glob) | |
116 |
|
120 | |||
117 | $ hg tglog |
|
121 | $ hg tglog | |
@@ -133,6 +137,8 b' Keep active bookmark on the correct chan' | |||||
133 | $ hg up -q X |
|
137 | $ hg up -q X | |
134 |
|
138 | |||
135 | $ hg rebase -d W |
|
139 | $ hg rebase -d W | |
|
140 | rebasing 1:6c81ed0049f8 "B" (X) | |||
|
141 | rebasing 2:49cb3485fa0c "C" (Y Z) | |||
136 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-backup.hg (glob) |
|
142 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-backup.hg (glob) | |
137 |
|
143 | |||
138 | $ hg tglog |
|
144 | $ hg tglog | |
@@ -162,6 +168,7 b' rebase --continue with bookmarks present' | |||||
162 | $ hg up 3 |
|
168 | $ hg up 3 | |
163 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
169 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
164 | $ hg rebase |
|
170 | $ hg rebase | |
|
171 | rebasing 3:3d5fa227f4b5 "C" (Y Z) | |||
165 | merging c |
|
172 | merging c | |
166 | warning: conflicts during merge. |
|
173 | warning: conflicts during merge. | |
167 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
174 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -171,6 +178,7 b' rebase --continue with bookmarks present' | |||||
171 | $ hg resolve --mark c |
|
178 | $ hg resolve --mark c | |
172 | (no more unresolved files) |
|
179 | (no more unresolved files) | |
173 | $ hg rebase --continue |
|
180 | $ hg rebase --continue | |
|
181 | rebasing 3:3d5fa227f4b5 "C" (Y Z) | |||
174 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob) |
|
182 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob) | |
175 | $ hg tglog |
|
183 | $ hg tglog | |
176 | @ 4: 'C' bookmarks: Y Z |
|
184 | @ 4: 'C' bookmarks: Y Z | |
@@ -198,4 +206,7 b' as --rev arguments (issue3950)' | |||||
198 | $ hg book bisect |
|
206 | $ hg book bisect | |
199 | $ hg update -q Y |
|
207 | $ hg update -q Y | |
200 | $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z |
|
208 | $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z | |
|
209 | rebasing 5:345c90f326a4 "bisect" | |||
|
210 | rebasing 6:f677a2907404 "bisect2" | |||
|
211 | rebasing 7:325c16001345 "bisect3" (tip bisect) | |||
201 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-backup.hg (glob) |
|
212 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-backup.hg (glob) |
@@ -105,6 +105,8 b' Rebase part of branch2 (5-6) onto branch' | |||||
105 | 0: 'A' |
|
105 | 0: 'A' | |
106 |
|
106 | |||
107 | $ hg rebase -s 5 -d 8 |
|
107 | $ hg rebase -s 5 -d 8 | |
|
108 | rebasing 5:635859577d0b "D" | |||
|
109 | rebasing 6:5097051d331d "E" | |||
108 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-backup.hg (glob) |
|
110 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-backup.hg (glob) | |
109 |
|
111 | |||
110 | $ hg branches |
|
112 | $ hg branches | |
@@ -166,6 +168,7 b' Rebase head of branch3 (8) onto branch2 ' | |||||
166 | o 0: 'A' |
|
168 | o 0: 'A' | |
167 |
|
169 | |||
168 | $ hg rebase -s 8 -d 6 |
|
170 | $ hg rebase -s 8 -d 6 | |
|
171 | rebasing 8:4666b71e8e32 "F" (tip) | |||
169 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-backup.hg (glob) |
|
172 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-backup.hg (glob) | |
170 |
|
173 | |||
171 | $ hg branches |
|
174 | $ hg branches | |
@@ -230,6 +233,8 b' Rebase entire branch3 (7-8) onto branch2' | |||||
230 | o 0: 'A' |
|
233 | o 0: 'A' | |
231 |
|
234 | |||
232 | $ hg rebase -s 7 -d 6 |
|
235 | $ hg rebase -s 7 -d 6 | |
|
236 | rebasing 7:653b9feb4616 "branch3" | |||
|
237 | rebasing 8:4666b71e8e32 "F" (tip) | |||
233 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-backup.hg (glob) |
|
238 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-backup.hg (glob) | |
234 |
|
239 | |||
235 | $ hg branches |
|
240 | $ hg branches | |
@@ -475,6 +480,8 b' Turn most changeset public' | |||||
475 | > true |
|
480 | > true | |
476 | > EOF |
|
481 | > EOF | |
477 | $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e |
|
482 | $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e | |
|
483 | rebasing 5:361a99976cc9 "F" | |||
478 | HGEDITFORM=rebase.merge |
|
484 | HGEDITFORM=rebase.merge | |
|
485 | rebasing 8:326cfedc031c "I" (tip) | |||
479 | HGEDITFORM=rebase.normal |
|
486 | HGEDITFORM=rebase.normal | |
480 | saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-backup.hg (glob) |
|
487 | saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-backup.hg (glob) |
@@ -65,6 +65,8 b' Rebasing B onto E - check keep: and phas' | |||||
65 | o 0:draft 'A' |
|
65 | o 0:draft 'A' | |
66 |
|
66 | |||
67 | $ hg rebase -s 1 -d 4 --keep |
|
67 | $ hg rebase -s 1 -d 4 --keep | |
|
68 | rebasing 1:27547f69f254 "B" | |||
|
69 | rebasing 2:965c486023db "C" | |||
68 | merging A |
|
70 | merging A | |
69 | warning: conflicts during merge. |
|
71 | warning: conflicts during merge. | |
70 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
72 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -78,6 +80,8 b' Solve the conflict and go on:' | |||||
78 | $ hg resolve -m A |
|
80 | $ hg resolve -m A | |
79 | (no more unresolved files) |
|
81 | (no more unresolved files) | |
80 | $ hg rebase --continue |
|
82 | $ hg rebase --continue | |
|
83 | already rebased 1:27547f69f254 "B" as 45396c49d53b | |||
|
84 | rebasing 2:965c486023db "C" | |||
81 |
|
85 | |||
82 | $ hg tglog |
|
86 | $ hg tglog | |
83 | o 7:secret 'C' |
|
87 | o 7:secret 'C' | |
@@ -119,6 +123,7 b' Rebase F onto E - check keepbranches:' | |||||
119 | o 0:draft 'A' |
|
123 | o 0:draft 'A' | |
120 |
|
124 | |||
121 | $ hg rebase -s 5 -d 4 --keepbranches |
|
125 | $ hg rebase -s 5 -d 4 --keepbranches | |
|
126 | rebasing 5:01e6ebbd8272 "F" (tip) | |||
122 | merging A |
|
127 | merging A | |
123 | warning: conflicts during merge. |
|
128 | warning: conflicts during merge. | |
124 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
129 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -132,6 +137,7 b' Solve the conflict and go on:' | |||||
132 | $ hg resolve -m A |
|
137 | $ hg resolve -m A | |
133 | (no more unresolved files) |
|
138 | (no more unresolved files) | |
134 | $ hg rebase --continue |
|
139 | $ hg rebase --continue | |
|
140 | rebasing 5:01e6ebbd8272 "F" (tip) | |||
135 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-backup.hg (glob) |
|
141 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-backup.hg (glob) | |
136 |
|
142 | |||
137 | $ hg tglog |
|
143 | $ hg tglog |
@@ -59,6 +59,9 b' Rebasing B onto H and collapsing changes' | |||||
59 | > echo "edited manually" >> \$1 |
|
59 | > echo "edited manually" >> \$1 | |
60 | > EOF |
|
60 | > EOF | |
61 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e |
|
61 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e | |
|
62 | rebasing 1:42ccdea3bb16 "B" | |||
|
63 | rebasing 2:5fddd98957c8 "C" | |||
|
64 | rebasing 3:32af7686d403 "D" | |||
62 | ==== before editing |
|
65 | ==== before editing | |
63 | Collapsed revision |
|
66 | Collapsed revision | |
64 | * B |
|
67 | * B | |
@@ -113,6 +116,8 b' Rebasing E onto H:' | |||||
113 |
|
116 | |||
114 | $ hg phase --force --secret 6 |
|
117 | $ hg phase --force --secret 6 | |
115 | $ hg rebase --source 4 --collapse |
|
118 | $ hg rebase --source 4 --collapse | |
|
119 | rebasing 4:9520eea781bc "E" | |||
|
120 | rebasing 6:eea13746799a "G" | |||
116 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-backup.hg (glob) |
|
121 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-backup.hg (glob) | |
117 |
|
122 | |||
118 | $ hg tglog |
|
123 | $ hg tglog | |
@@ -153,6 +158,8 b' Rebasing G onto H with custom message:' | |||||
153 | > true |
|
158 | > true | |
154 | > EOF |
|
159 | > EOF | |
155 | $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e |
|
160 | $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e | |
|
161 | rebasing 4:9520eea781bc "E" | |||
|
162 | rebasing 6:eea13746799a "G" | |||
156 | HGEDITFORM=rebase.collapse |
|
163 | HGEDITFORM=rebase.collapse | |
157 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-backup.hg (glob) |
|
164 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-backup.hg (glob) | |
158 |
|
165 | |||
@@ -261,6 +268,9 b' Rebase and collapse - more than one exte' | |||||
261 | Rebase and collapse - E onto H: |
|
268 | Rebase and collapse - E onto H: | |
262 |
|
269 | |||
263 | $ hg rebase -s 4 --collapse # root (4) is not a merge |
|
270 | $ hg rebase -s 4 --collapse # root (4) is not a merge | |
|
271 | rebasing 4:8a5212ebc852 "E" | |||
|
272 | rebasing 5:7f219660301f "F" | |||
|
273 | rebasing 6:c772a8b2dc17 "G" | |||
264 | saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-backup.hg (glob) |
|
274 | saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-backup.hg (glob) | |
265 |
|
275 | |||
266 | $ hg tglog |
|
276 | $ hg tglog | |
@@ -409,7 +419,11 b' Rebase and collapse - E onto I:' | |||||
409 | $ cd c1 |
|
419 | $ cd c1 | |
410 |
|
420 | |||
411 | $ hg rebase -s 4 --collapse # root (4) is not a merge |
|
421 | $ hg rebase -s 4 --collapse # root (4) is not a merge | |
|
422 | rebasing 4:8a5212ebc852 "E" | |||
|
423 | rebasing 5:dca5924bb570 "F" | |||
412 | merging E |
|
424 | merging E | |
|
425 | rebasing 6:55a44ad28289 "G" | |||
|
426 | rebasing 7:417d3b648079 "H" | |||
413 | saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-backup.hg (glob) |
|
427 | saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-backup.hg (glob) | |
414 |
|
428 | |||
415 | $ hg tglog |
|
429 | $ hg tglog | |
@@ -499,6 +513,10 b' Rebase and collapse - B onto F:' | |||||
499 | $ cd d1 |
|
513 | $ cd d1 | |
500 |
|
514 | |||
501 | $ hg rebase -s 1 --collapse |
|
515 | $ hg rebase -s 1 --collapse | |
|
516 | rebasing 1:27547f69f254 "B" | |||
|
517 | rebasing 2:f838bfaca5c7 "C" | |||
|
518 | rebasing 3:7bbcd6078bcc "D" | |||
|
519 | rebasing 4:0a42590ed746 "E" | |||
502 | saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-backup.hg (glob) |
|
520 | saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-backup.hg (glob) | |
503 |
|
521 | |||
504 | $ hg tglog |
|
522 | $ hg tglog | |
@@ -583,6 +601,7 b' Interactions between collapse and keepbr' | |||||
583 | o 0: 'A' |
|
601 | o 0: 'A' | |
584 |
|
602 | |||
585 | $ hg rebase -s 5 -d 4 |
|
603 | $ hg rebase -s 5 -d 4 | |
|
604 | rebasing 5:fbfb97b1089a "E" (tip) | |||
586 | saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-backup.hg (glob) |
|
605 | saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-backup.hg (glob) | |
587 | $ hg tglog |
|
606 | $ hg tglog | |
588 | @ 4: 'E' |
|
607 | @ 4: 'E' | |
@@ -634,9 +653,11 b' Rebase, collapse and copies' | |||||
634 | o 0: 'add' |
|
653 | o 0: 'add' | |
635 |
|
654 | |||
636 | $ hg rebase --collapse -d 1 |
|
655 | $ hg rebase --collapse -d 1 | |
|
656 | rebasing 2:6e7340ee38c0 "move1" | |||
637 | merging a and d to d |
|
657 | merging a and d to d | |
638 | merging b and e to e |
|
658 | merging b and e to e | |
639 | merging c and f to f |
|
659 | merging c and f to f | |
|
660 | rebasing 3:338e84e2e558 "move2" (tip) | |||
640 | merging f and c to c |
|
661 | merging f and c to c | |
641 | merging e and g to g |
|
662 | merging e and g to g | |
642 | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-backup.hg (glob) |
|
663 | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-backup.hg (glob) | |
@@ -678,6 +699,8 b' Test collapsing a middle revision in-pla' | |||||
678 | Test collapsing in place |
|
699 | Test collapsing in place | |
679 |
|
700 | |||
680 | $ hg rebase --collapse -b . -d 0 |
|
701 | $ hg rebase --collapse -b . -d 0 | |
|
702 | rebasing 1:1352765a01d4 "change" | |||
|
703 | rebasing 2:64b456429f67 "Collapsed revision" (tip) | |||
681 | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-backup.hg (glob) |
|
704 | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-backup.hg (glob) | |
682 | $ hg st --change tip --copies |
|
705 | $ hg st --change tip --copies | |
683 | M a |
|
706 | M a | |
@@ -768,6 +791,8 b' Test collapsing changes that add then re' | |||||
768 | adding b |
|
791 | adding b | |
769 | $ hg book foo |
|
792 | $ hg book foo | |
770 | $ hg rebase -d 0 -r "1::2" --collapse -m collapsed |
|
793 | $ hg rebase -d 0 -r "1::2" --collapse -m collapsed | |
|
794 | rebasing 1:6d8d9f24eec3 "a" | |||
|
795 | rebasing 2:1cc73eca5ecc "b" (tip foo) | |||
771 | saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-backup.hg (glob) |
|
796 | saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-backup.hg (glob) | |
772 | $ hg log -G --template "{rev}: '{desc}' {bookmarks}" |
|
797 | $ hg log -G --template "{rev}: '{desc}' {bookmarks}" | |
773 | @ 1: 'collapsed' foo |
|
798 | @ 1: 'collapsed' foo |
@@ -61,6 +61,8 b' Try to call --continue:' | |||||
61 | Conflicting rebase: |
|
61 | Conflicting rebase: | |
62 |
|
62 | |||
63 | $ hg rebase -s 3 -d 2 |
|
63 | $ hg rebase -s 3 -d 2 | |
|
64 | rebasing 3:3163e20567cc "L1" | |||
|
65 | rebasing 4:46f0b057b5c0 "L2" | |||
64 | merging common |
|
66 | merging common | |
65 | warning: conflicts during merge. |
|
67 | warning: conflicts during merge. | |
66 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
68 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -70,6 +72,8 b' Conflicting rebase:' | |||||
70 | Try to continue without solving the conflict: |
|
72 | Try to continue without solving the conflict: | |
71 |
|
73 | |||
72 | $ hg rebase --continue |
|
74 | $ hg rebase --continue | |
|
75 | already rebased 3:3163e20567cc "L1" as 3e046f2ecedb | |||
|
76 | rebasing 4:46f0b057b5c0 "L2" | |||
73 | abort: unresolved merge conflicts (see hg help resolve) |
|
77 | abort: unresolved merge conflicts (see hg help resolve) | |
74 | [255] |
|
78 | [255] | |
75 |
|
79 | |||
@@ -79,6 +83,9 b' Conclude rebase:' | |||||
79 | $ hg resolve -m common |
|
83 | $ hg resolve -m common | |
80 | (no more unresolved files) |
|
84 | (no more unresolved files) | |
81 | $ hg rebase --continue |
|
85 | $ hg rebase --continue | |
|
86 | already rebased 3:3163e20567cc "L1" as 3e046f2ecedb | |||
|
87 | rebasing 4:46f0b057b5c0 "L2" | |||
|
88 | rebasing 5:8029388f38dc "L3" (mybook) | |||
82 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-backup.hg (glob) |
|
89 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-backup.hg (glob) | |
83 |
|
90 | |||
84 | $ hg tglog |
|
91 | $ hg tglog | |
@@ -212,6 +219,7 b' Check that the right ancestors is used w' | |||||
212 |
|
219 | |||
213 | $ hg rebase -s9 -d2 --debug # use debug to really check merge base used |
|
220 | $ hg rebase -s9 -d2 --debug # use debug to really check merge base used | |
214 | rebase onto 2 starting from e31216eec445 |
|
221 | rebase onto 2 starting from e31216eec445 | |
|
222 | rebasing 9:e31216eec445 "more changes to f1" | |||
215 | rebasing: 9:e31216eec445 5/6 changesets (83.33%) |
|
223 | rebasing: 9:e31216eec445 5/6 changesets (83.33%) | |
216 | future parents are 2 and -1 |
|
224 | future parents are 2 and -1 | |
217 | rebase status stored |
|
225 | rebase status stored | |
@@ -235,6 +243,7 b' Check that the right ancestors is used w' | |||||
235 | getting f1.txt |
|
243 | getting f1.txt | |
236 | updating: f1.txt 1/1 files (100.00%) |
|
244 | updating: f1.txt 1/1 files (100.00%) | |
237 | f1.txt |
|
245 | f1.txt | |
|
246 | rebasing 10:2f2496ddf49d "merge" (tip) | |||
238 | rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%) |
|
247 | rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%) | |
239 | future parents are 11 and 7 |
|
248 | future parents are 11 and 7 | |
240 | rebase status stored |
|
249 | rebase status stored |
@@ -48,6 +48,7 b' Rebasing D onto H detaching from C:' | |||||
48 |
|
48 | |||
49 | $ hg phase --force --secret 3 |
|
49 | $ hg phase --force --secret 3 | |
50 | $ hg rebase -s 3 -d 7 |
|
50 | $ hg rebase -s 3 -d 7 | |
|
51 | rebasing 3:32af7686d403 "D" | |||
51 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-backup.hg (glob) |
|
52 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-backup.hg (glob) | |
52 |
|
53 | |||
53 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
|
54 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" | |
@@ -99,6 +100,8 b' Rebasing C onto H detaching from B:' | |||||
99 | o 0: 'A' |
|
100 | o 0: 'A' | |
100 |
|
101 | |||
101 | $ hg rebase -s 2 -d 7 |
|
102 | $ hg rebase -s 2 -d 7 | |
|
103 | rebasing 2:5fddd98957c8 "C" | |||
|
104 | rebasing 3:32af7686d403 "D" | |||
102 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
|
105 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-backup.hg (glob) | |
103 |
|
106 | |||
104 | $ hg tglog |
|
107 | $ hg tglog | |
@@ -151,6 +154,9 b' Rebasing B onto H using detach (same as ' | |||||
151 | o 0: 'A' |
|
154 | o 0: 'A' | |
152 |
|
155 | |||
153 | $ hg rebase -s 1 -d 7 |
|
156 | $ hg rebase -s 1 -d 7 | |
|
157 | rebasing 1:42ccdea3bb16 "B" | |||
|
158 | rebasing 2:5fddd98957c8 "C" | |||
|
159 | rebasing 3:32af7686d403 "D" | |||
154 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
|
160 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) | |
155 |
|
161 | |||
156 | $ hg tglog |
|
162 | $ hg tglog | |
@@ -205,6 +211,8 b' Rebasing C onto H detaching from B and c' | |||||
205 | o 0: 'A' |
|
211 | o 0: 'A' | |
206 |
|
212 | |||
207 | $ hg rebase --collapse -s 2 -d 7 |
|
213 | $ hg rebase --collapse -s 2 -d 7 | |
|
214 | rebasing 2:5fddd98957c8 "C" | |||
|
215 | rebasing 3:32af7686d403 "D" | |||
208 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
|
216 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob) | |
209 |
|
217 | |||
210 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
|
218 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" | |
@@ -264,6 +272,9 b' Rebasing across null as ancestor' | |||||
264 | o 0: 'A' |
|
272 | o 0: 'A' | |
265 |
|
273 | |||
266 | $ hg rebase -s 1 -d tip |
|
274 | $ hg rebase -s 1 -d tip | |
|
275 | rebasing 1:42ccdea3bb16 "B" | |||
|
276 | rebasing 2:5fddd98957c8 "C" | |||
|
277 | rebasing 3:32af7686d403 "D" | |||
267 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
|
278 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) | |
268 |
|
279 | |||
269 | $ hg tglog |
|
280 | $ hg tglog | |
@@ -287,6 +298,8 b' Rebasing across null as ancestor' | |||||
287 |
|
298 | |||
288 |
|
299 | |||
289 | $ hg rebase -d 5 -s 7 |
|
300 | $ hg rebase -d 5 -s 7 | |
|
301 | rebasing 7:13547172c9c0 "C" | |||
|
302 | rebasing 8:4e27a76c371a "D" (tip) | |||
290 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob) |
|
303 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob) | |
291 | $ hg tglog |
|
304 | $ hg tglog | |
292 | o 8: 'D' |
|
305 | o 8: 'D' | |
@@ -325,6 +338,9 b' Verify that target is not selected as ex' | |||||
325 | $ hg ci -m "J" |
|
338 | $ hg ci -m "J" | |
326 |
|
339 | |||
327 | $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other |
|
340 | $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other | |
|
341 | rebasing 8:9790e768172d "I" | |||
|
342 | rebasing 9:5d7b11f5fb97 "Merge" | |||
|
343 | rebasing 10:9427d4d5af81 "J" (tip) | |||
328 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-backup.hg (glob) |
|
344 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-backup.hg (glob) | |
329 |
|
345 | |||
330 | $ hg tglog |
|
346 | $ hg tglog | |
@@ -368,6 +384,7 b' Ensure --continue restores a correct sta' | |||||
368 | adding H |
|
384 | adding H | |
369 | $ hg phase --force --secret 8 |
|
385 | $ hg phase --force --secret 8 | |
370 | $ hg rebase -s 8 -d 7 --config ui.merge=internal:fail |
|
386 | $ hg rebase -s 8 -d 7 --config ui.merge=internal:fail | |
|
387 | rebasing 8:6215fafa5447 "H2" (tip) | |||
371 | merging H |
|
388 | merging H | |
372 | warning: conflicts during merge. |
|
389 | warning: conflicts during merge. | |
373 | merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
390 | merging H incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -376,6 +393,7 b' Ensure --continue restores a correct sta' | |||||
376 | $ hg resolve --all -t internal:local |
|
393 | $ hg resolve --all -t internal:local | |
377 | (no more unresolved files) |
|
394 | (no more unresolved files) | |
378 | $ hg rebase -c |
|
395 | $ hg rebase -c | |
|
396 | rebasing 8:6215fafa5447 "H2" (tip) | |||
379 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) |
|
397 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) | |
380 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
|
398 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" | |
381 | @ 7:draft 'H' |
|
399 | @ 7:draft 'H' |
@@ -57,6 +57,8 b' Changes during an interruption - continu' | |||||
57 | Rebasing B onto E: |
|
57 | Rebasing B onto E: | |
58 |
|
58 | |||
59 | $ hg rebase -s 1 -d 4 |
|
59 | $ hg rebase -s 1 -d 4 | |
|
60 | rebasing 1:27547f69f254 "B" | |||
|
61 | rebasing 2:965c486023db "C" | |||
60 | merging A |
|
62 | merging A | |
61 | warning: conflicts during merge. |
|
63 | warning: conflicts during merge. | |
62 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
64 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -93,6 +95,8 b' Force this commit onto secret phase' | |||||
93 | Resume the rebasing: |
|
95 | Resume the rebasing: | |
94 |
|
96 | |||
95 | $ hg rebase --continue |
|
97 | $ hg rebase --continue | |
|
98 | already rebased 1:27547f69f254 "B" as 45396c49d53b | |||
|
99 | rebasing 2:965c486023db "C" | |||
96 | merging A |
|
100 | merging A | |
97 | warning: conflicts during merge. |
|
101 | warning: conflicts during merge. | |
98 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
102 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -107,6 +111,8 b' Solve the conflict and go on:' | |||||
107 | (no more unresolved files) |
|
111 | (no more unresolved files) | |
108 |
|
112 | |||
109 | $ hg rebase --continue |
|
113 | $ hg rebase --continue | |
|
114 | already rebased 1:27547f69f254 "B" as 45396c49d53b | |||
|
115 | rebasing 2:965c486023db "C" | |||
110 | warning: new changesets detected on source branch, not stripping |
|
116 | warning: new changesets detected on source branch, not stripping | |
111 |
|
117 | |||
112 | $ hg tglogp |
|
118 | $ hg tglogp | |
@@ -148,6 +154,8 b' Changes during an interruption - abort:' | |||||
148 | Rebasing B onto E: |
|
154 | Rebasing B onto E: | |
149 |
|
155 | |||
150 | $ hg rebase -s 1 -d 4 |
|
156 | $ hg rebase -s 1 -d 4 | |
|
157 | rebasing 1:27547f69f254 "B" | |||
|
158 | rebasing 2:965c486023db "C" | |||
151 | merging A |
|
159 | merging A | |
152 | warning: conflicts during merge. |
|
160 | warning: conflicts during merge. | |
153 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
161 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -219,6 +227,8 b' Changes during an interruption - abort (' | |||||
219 | Rebasing B onto E: |
|
227 | Rebasing B onto E: | |
220 |
|
228 | |||
221 | $ hg rebase -s 1 -d 4 |
|
229 | $ hg rebase -s 1 -d 4 | |
|
230 | rebasing 1:27547f69f254 "B" | |||
|
231 | rebasing 2:965c486023db "C" | |||
222 | merging A |
|
232 | merging A | |
223 | warning: conflicts during merge. |
|
233 | warning: conflicts during merge. | |
224 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
234 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
@@ -52,6 +52,7 b' Rebase with no arguments - single revisi' | |||||
52 | $ hg up -q -C 2 |
|
52 | $ hg up -q -C 2 | |
53 |
|
53 | |||
54 | $ hg rebase |
|
54 | $ hg rebase | |
|
55 | rebasing 2:87c180a611f2 "l1" | |||
55 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-backup.hg (glob) |
|
56 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-backup.hg (glob) | |
56 |
|
57 | |||
57 | $ hg tglog |
|
58 | $ hg tglog | |
@@ -110,6 +111,8 b' Rebase with no arguments - single revisi' | |||||
110 | $ hg up -q -C 3 |
|
111 | $ hg up -q -C 3 | |
111 |
|
112 | |||
112 | $ hg rebase |
|
113 | $ hg rebase | |
|
114 | rebasing 2:87c180a611f2 "l1" | |||
|
115 | rebasing 3:1ac923b736ef "l2" | |||
113 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-backup.hg (glob) |
|
116 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-backup.hg (glob) | |
114 |
|
117 | |||
115 | $ hg tglog |
|
118 | $ hg tglog |
@@ -50,6 +50,8 b' already has one local mq patch' | |||||
50 | $ hg up -q -C qtip |
|
50 | $ hg up -q -C qtip | |
51 |
|
51 | |||
52 | $ hg rebase |
|
52 | $ hg rebase | |
|
53 | rebasing 2:13a46ce44f60 "P0" (p0.patch qbase) | |||
|
54 | rebasing 3:148775c71080 "P1" (p1.patch qtip) | |||
53 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-backup.hg (glob) |
|
55 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-backup.hg (glob) | |
54 |
|
56 | |||
55 | $ hg tglog |
|
57 | $ hg tglog | |
@@ -107,6 +109,10 b' already has one local mq patch' | |||||
107 | $ hg up -q qtip |
|
109 | $ hg up -q qtip | |
108 |
|
110 | |||
109 | $ HGMERGE=internal:fail hg rebase |
|
111 | $ HGMERGE=internal:fail hg rebase | |
|
112 | rebasing 1:b4bffa6e4776 "r1" (1.diff qbase) | |||
|
113 | rebasing 2:c0fd129beb01 "r2" (2.diff) | |||
|
114 | rebasing 3:6ff5b8feed8e "r3" (3.diff) | |||
|
115 | rebasing 4:094320fec554 "r4" (4.diff) | |||
110 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
116 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
111 | [1] |
|
117 | [1] | |
112 |
|
118 | |||
@@ -114,6 +120,12 b' already has one local mq patch' | |||||
114 | (no more unresolved files) |
|
120 | (no more unresolved files) | |
115 |
|
121 | |||
116 | $ hg rebase --continue |
|
122 | $ hg rebase --continue | |
|
123 | already rebased 1:b4bffa6e4776 "r1" (1.diff qbase) as 057f55ff8f44 | |||
|
124 | already rebased 2:c0fd129beb01 "r2" (2.diff) as 1660ab13ce9a | |||
|
125 | already rebased 3:6ff5b8feed8e "r3" (3.diff) as 1660ab13ce9a | |||
|
126 | rebasing 4:094320fec554 "r4" (4.diff) | |||
|
127 | rebasing 5:681a378595ba "r5" (5.diff) | |||
|
128 | rebasing 6:512a1f24768b "r6" (6.diff qtip) | |||
117 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-backup.hg (glob) |
|
129 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-backup.hg (glob) | |
118 |
|
130 | |||
119 | $ hg tglog |
|
131 | $ hg tglog |
@@ -59,6 +59,7 b' Rebase - same thing, but mq patch is def' | |||||
59 | Rebase - generate a conflict: |
|
59 | Rebase - generate a conflict: | |
60 |
|
60 | |||
61 | $ hg rebase -s 2 -d 1 |
|
61 | $ hg rebase -s 2 -d 1 | |
|
62 | rebasing 2:3504f44bffc0 "P0" (f.patch qbase) | |||
62 | merging f |
|
63 | merging f | |
63 | warning: conflicts during merge. |
|
64 | warning: conflicts during merge. | |
64 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
65 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -71,6 +72,8 b' Fix the 1st conflict:' | |||||
71 | $ hg resolve -m f |
|
72 | $ hg resolve -m f | |
72 | (no more unresolved files) |
|
73 | (no more unresolved files) | |
73 | $ hg rebase -c |
|
74 | $ hg rebase -c | |
|
75 | rebasing 2:3504f44bffc0 "P0" (f.patch qbase) | |||
|
76 | rebasing 3:929394423cd3 "P1" (f2.patch qtip tip) | |||
74 | merging f |
|
77 | merging f | |
75 | warning: conflicts during merge. |
|
78 | warning: conflicts during merge. | |
76 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
79 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -83,6 +86,8 b' Fix the 2nd conflict:' | |||||
83 | $ hg resolve -m f |
|
86 | $ hg resolve -m f | |
84 | (no more unresolved files) |
|
87 | (no more unresolved files) | |
85 | $ hg rebase -c |
|
88 | $ hg rebase -c | |
|
89 | already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c | |||
|
90 | rebasing 3:929394423cd3 "P1" (f2.patch qtip) | |||
86 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-backup.hg (glob) |
|
91 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-backup.hg (glob) | |
87 |
|
92 | |||
88 | $ hg tglog |
|
93 | $ hg tglog | |
@@ -198,6 +203,8 b' Adding one git-style patch and one norma' | |||||
198 | Rebase the applied mq patches: |
|
203 | Rebase the applied mq patches: | |
199 |
|
204 | |||
200 | $ hg rebase -s 2 -d 1 |
|
205 | $ hg rebase -s 2 -d 1 | |
|
206 | rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase) | |||
|
207 | rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip) | |||
201 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-backup.hg (glob) |
|
208 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-backup.hg (glob) | |
202 |
|
209 | |||
203 | $ hg qci -m 'save patch state' |
|
210 | $ hg qci -m 'save patch state' |
@@ -69,6 +69,10 b'' | |||||
69 | Branch name containing a dash (issue3181) |
|
69 | Branch name containing a dash (issue3181) | |
70 |
|
70 | |||
71 | $ hg rebase -b dev-two -d dev-one --keepbranches |
|
71 | $ hg rebase -b dev-two -d dev-one --keepbranches | |
|
72 | rebasing 5:24b6387c8c8c "F" | |||
|
73 | rebasing 6:eea13746799a "G" | |||
|
74 | rebasing 7:02de42196ebe "H" | |||
|
75 | rebasing 9:cb039b7cae8e "dev-two named branch" (tip) | |||
72 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-backup.hg (glob) |
|
76 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-backup.hg (glob) | |
73 |
|
77 | |||
74 | $ hg tglog |
|
78 | $ hg tglog | |
@@ -93,6 +97,11 b' Branch name containing a dash (issue3181' | |||||
93 | o 0: 'A' |
|
97 | o 0: 'A' | |
94 |
|
98 | |||
95 | $ hg rebase -s dev-one -d 0 --keepbranches |
|
99 | $ hg rebase -s dev-one -d 0 --keepbranches | |
|
100 | rebasing 5:643fc9128048 "dev-one named branch" | |||
|
101 | rebasing 6:24de4aff8e28 "F" | |||
|
102 | rebasing 7:4b988a958030 "G" | |||
|
103 | rebasing 8:31d0e4ba75e6 "H" | |||
|
104 | rebasing 9:9e70cd31750f "dev-two named branch" (tip) | |||
96 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-backup.hg (glob) |
|
105 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-backup.hg (glob) | |
97 |
|
106 | |||
98 | $ hg tglog |
|
107 | $ hg tglog | |
@@ -143,6 +152,10 b' Branch name containing a dash (issue3181' | |||||
143 | o 0: 'A' |
|
152 | o 0: 'A' | |
144 |
|
153 | |||
145 | $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches |
|
154 | $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches | |
|
155 | rebasing 5:77854864208c "F" | |||
|
156 | rebasing 6:63b4f9c788a1 "G" | |||
|
157 | rebasing 7:87861e68abd3 "H" | |||
|
158 | rebasing 8:ec00d4e0efca "dev-two named branch" | |||
146 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/77854864208c-backup.hg (glob) |
|
159 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/77854864208c-backup.hg (glob) | |
147 |
|
160 | |||
148 | $ hg tglog |
|
161 | $ hg tglog | |
@@ -167,6 +180,11 b' Branch name containing a dash (issue3181' | |||||
167 | o 0: 'A' |
|
180 | o 0: 'A' | |
168 |
|
181 | |||
169 | $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches |
|
182 | $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches | |
|
183 | rebasing 5:643fc9128048 "dev-one named branch" | |||
|
184 | rebasing 6:05584c618d45 "F" | |||
|
185 | rebasing 7:471695f5257d "G" | |||
|
186 | rebasing 8:8382a539a2df "H" | |||
|
187 | rebasing 9:11f718458b32 "dev-two named branch" (tip) | |||
170 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-backup.hg (glob) |
|
188 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-backup.hg (glob) | |
171 |
|
189 | |||
172 | $ hg tglog |
|
190 | $ hg tglog | |
@@ -192,6 +210,9 b' Branch name containing a dash (issue3181' | |||||
192 | Rebasing descendant onto ancestor across different named branches |
|
210 | Rebasing descendant onto ancestor across different named branches | |
193 |
|
211 | |||
194 | $ hg rebase -s 1 -d 8 --keepbranches |
|
212 | $ hg rebase -s 1 -d 8 --keepbranches | |
|
213 | rebasing 1:42ccdea3bb16 "B" | |||
|
214 | rebasing 2:5fddd98957c8 "C" | |||
|
215 | rebasing 3:32af7686d403 "D" | |||
195 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
|
216 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) | |
196 |
|
217 | |||
197 | $ hg tglog |
|
218 | $ hg tglog | |
@@ -218,6 +239,10 b' Rebasing descendant onto ancestor across' | |||||
218 | [255] |
|
239 | [255] | |
219 |
|
240 | |||
220 | $ hg rebase -s 5 -d 4 |
|
241 | $ hg rebase -s 5 -d 4 | |
|
242 | rebasing 5:32d3b0de7f37 "dev-two named branch" | |||
|
243 | rebasing 6:580fcd9fd48f "B" | |||
|
244 | rebasing 7:32aba0402ed2 "C" | |||
|
245 | rebasing 8:e4787b575338 "D" (tip) | |||
221 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32d3b0de7f37-backup.hg (glob) |
|
246 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32d3b0de7f37-backup.hg (glob) | |
222 |
|
247 | |||
223 | $ hg tglog |
|
248 | $ hg tglog | |
@@ -248,6 +273,11 b' Reopen branch by rebase' | |||||
248 | $ hg ci -m 'close b' --close |
|
273 | $ hg ci -m 'close b' --close | |
249 | $ hg rebase -b 8 -d b |
|
274 | $ hg rebase -b 8 -d b | |
250 | reopening closed branch head ea9de14a36c6 |
|
275 | reopening closed branch head ea9de14a36c6 | |
|
276 | rebasing 4:86693275b2ef "H" | |||
|
277 | rebasing 5:2149726d0970 "dev-two named branch" | |||
|
278 | rebasing 6:81e55225e95d "B" | |||
|
279 | rebasing 7:09eda3dc3195 "C" | |||
|
280 | rebasing 8:31298fc9d159 "D" | |||
251 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/86693275b2ef-backup.hg (glob) |
|
281 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/86693275b2ef-backup.hg (glob) | |
252 |
|
282 | |||
253 | $ cd .. |
|
283 | $ cd .. | |
@@ -302,6 +332,7 b" rebase 'b1' on top of the tip of the bra" | |||||
302 | $ cd ../case2 |
|
332 | $ cd ../case2 | |
303 | $ hg up -qr 1 |
|
333 | $ hg up -qr 1 | |
304 | $ hg rebase |
|
334 | $ hg rebase | |
|
335 | rebasing 1:40039acb7ca5 "b1" | |||
305 | saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-backup.hg (glob) |
|
336 | saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-backup.hg (glob) | |
306 | $ hg tglog |
|
337 | $ hg tglog | |
307 | @ 3: 'b1' b |
|
338 | @ 3: 'b1' b |
@@ -38,7 +38,9 b'' | |||||
38 | o 0: 'A' |
|
38 | o 0: 'A' | |
39 |
|
39 | |||
40 | $ hg rebase -s 1 -d 3 |
|
40 | $ hg rebase -s 1 -d 3 | |
|
41 | rebasing 1:0f4f7cb4f549 "B" | |||
41 | merging a |
|
42 | merging a | |
|
43 | rebasing 2:30ae917c0e4f "C" | |||
42 | merging a |
|
44 | merging a | |
43 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-backup.hg (glob) |
|
45 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-backup.hg (glob) | |
44 |
|
46 | |||
@@ -125,8 +127,12 b' wrong.' | |||||
125 | Full rebase all the way back from branching point: |
|
127 | Full rebase all the way back from branching point: | |
126 |
|
128 | |||
127 | $ hg rebase -r 'only(dev,default)' -d default |
|
129 | $ hg rebase -r 'only(dev,default)' -d default | |
|
130 | rebasing 1:1d1a643d390e "dev: create branch" | |||
|
131 | rebasing 2:ec2c14fb2984 "dev: f-dev stuff" | |||
|
132 | rebasing 4:4b019212aaf6 "dev: merge default" | |||
128 | remote changed f-default which local deleted |
|
133 | remote changed f-default which local deleted | |
129 | use (c)hanged version or leave (d)eleted? c |
|
134 | use (c)hanged version or leave (d)eleted? c | |
|
135 | rebasing 6:9455ee510502 "dev: merge default" | |||
130 | saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-backup.hg (glob) |
|
136 | saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-backup.hg (glob) | |
131 | $ hg tglog |
|
137 | $ hg tglog | |
132 | o 6: 'dev: merge default' |
|
138 | o 6: 'dev: merge default' | |
@@ -149,8 +155,11 b' Grafty cherry picking rebasing:' | |||||
149 |
|
155 | |||
150 | $ hg phase -fdr0: |
|
156 | $ hg phase -fdr0: | |
151 | $ hg rebase -r 'children(only(dev,default))' -d default |
|
157 | $ hg rebase -r 'children(only(dev,default))' -d default | |
|
158 | rebasing 2:ec2c14fb2984 "dev: f-dev stuff" | |||
|
159 | rebasing 4:4b019212aaf6 "dev: merge default" | |||
152 | remote changed f-default which local deleted |
|
160 | remote changed f-default which local deleted | |
153 | use (c)hanged version or leave (d)eleted? c |
|
161 | use (c)hanged version or leave (d)eleted? c | |
|
162 | rebasing 6:9455ee510502 "dev: merge default" | |||
154 | saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-backup.hg (glob) |
|
163 | saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-backup.hg (glob) | |
155 | $ hg tglog |
|
164 | $ hg tglog | |
156 | o 7: 'dev: merge default' |
|
165 | o 7: 'dev: merge default' | |
@@ -222,6 +231,7 b' Test order of parents of rebased merged ' | |||||
222 | o 0: 'common' |
|
231 | o 0: 'common' | |
223 |
|
232 | |||
224 | $ hg rebase -r 4 -d 2 |
|
233 | $ hg rebase -r 4 -d 2 | |
|
234 | rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor" | |||
225 | saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-backup.hg (glob) |
|
235 | saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-backup.hg (glob) | |
226 | $ hg tip |
|
236 | $ hg tip | |
227 | changeset: 5:cca50676b1c5 |
|
237 | changeset: 5:cca50676b1c5 | |
@@ -233,6 +243,7 b' Test order of parents of rebased merged ' | |||||
233 | summary: merge p1 3=outside p2 1=ancestor |
|
243 | summary: merge p1 3=outside p2 1=ancestor | |
234 |
|
244 | |||
235 | $ hg rebase -r 4 -d 2 |
|
245 | $ hg rebase -r 4 -d 2 | |
|
246 | rebasing 4:a57575f79074 "merge p1 1=ancestor p2 3=outside" | |||
236 | saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-backup.hg (glob) |
|
247 | saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-backup.hg (glob) | |
237 | $ hg tip |
|
248 | $ hg tip | |
238 | changeset: 5:f9daf77ffe76 |
|
249 | changeset: 5:f9daf77ffe76 | |
@@ -263,6 +274,7 b' rebase of merge of ancestors' | |||||
263 | $ echo 'other change while merging future "rebase ancestors"' > other |
|
274 | $ echo 'other change while merging future "rebase ancestors"' > other | |
264 | $ hg ci -Aqm 'merge rebase ancestors' |
|
275 | $ hg ci -Aqm 'merge rebase ancestors' | |
265 | $ hg rebase -d 5 -v |
|
276 | $ hg rebase -d 5 -v | |
|
277 | rebasing 6:4c5f12f25ebe "merge rebase ancestors" (tip) | |||
266 | resolving manifests |
|
278 | resolving manifests | |
267 | removing other |
|
279 | removing other | |
268 | note: merging f9daf77ffe76+ and 4c5f12f25ebe using bids from ancestors a60552eb93fb and f59da8fc0fcf |
|
280 | note: merging f9daf77ffe76+ and 4c5f12f25ebe using bids from ancestors a60552eb93fb and f59da8fc0fcf |
@@ -56,6 +56,9 b' simple rebase' | |||||
56 | $ hg up 32af7686d403 |
|
56 | $ hg up 32af7686d403 | |
57 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
57 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
58 | $ hg rebase -d eea13746799a |
|
58 | $ hg rebase -d eea13746799a | |
|
59 | rebasing 1:42ccdea3bb16 "B" | |||
|
60 | rebasing 2:5fddd98957c8 "C" | |||
|
61 | rebasing 3:32af7686d403 "D" | |||
59 | $ hg log -G |
|
62 | $ hg log -G | |
60 | @ 10:8eeb3c33ad33 D |
|
63 | @ 10:8eeb3c33ad33 D | |
61 | | |
|
64 | | | |
@@ -121,6 +124,9 b' set.' | |||||
121 | grafting 1:42ccdea3bb16 "B" |
|
124 | grafting 1:42ccdea3bb16 "B" | |
122 | grafting 3:32af7686d403 "D" |
|
125 | grafting 3:32af7686d403 "D" | |
123 | $ hg rebase -s 42ccdea3bb16 -d . |
|
126 | $ hg rebase -s 42ccdea3bb16 -d . | |
|
127 | rebasing 1:42ccdea3bb16 "B" | |||
|
128 | rebasing 2:5fddd98957c8 "C" | |||
|
129 | rebasing 3:32af7686d403 "D" | |||
124 | $ hg log -G |
|
130 | $ hg log -G | |
125 | o 10:5ae4c968c6ac C |
|
131 | o 10:5ae4c968c6ac C | |
126 | | |
|
132 | | | |
@@ -170,6 +176,7 b' set.' | |||||
170 | More complex case were part of the rebase set were already rebased |
|
176 | More complex case were part of the rebase set were already rebased | |
171 |
|
177 | |||
172 | $ hg rebase --rev 'desc(D)' --dest 'desc(H)' |
|
178 | $ hg rebase --rev 'desc(D)' --dest 'desc(H)' | |
|
179 | rebasing 9:08483444fef9 "D" | |||
173 | $ hg debugobsolete |
|
180 | $ hg debugobsolete | |
174 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) |
|
181 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) | |
175 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) |
|
182 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) | |
@@ -195,6 +202,9 b' More complex case were part of the rebas' | |||||
195 | o 0:cd010b8cd998 A |
|
202 | o 0:cd010b8cd998 A | |
196 |
|
203 | |||
197 | $ hg rebase --source 'desc(B)' --dest 'tip' |
|
204 | $ hg rebase --source 'desc(B)' --dest 'tip' | |
|
205 | rebasing 8:8877864f1edb "B" | |||
|
206 | rebasing 9:08483444fef9 "D" | |||
|
207 | rebasing 10:5ae4c968c6ac "C" | |||
198 | $ hg debugobsolete |
|
208 | $ hg debugobsolete | |
199 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) |
|
209 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) | |
200 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) |
|
210 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) | |
@@ -247,6 +257,9 b' collapse rebase' | |||||
247 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
257 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
248 | $ cd collapse |
|
258 | $ cd collapse | |
249 | $ hg rebase -s 42ccdea3bb16 -d eea13746799a --collapse |
|
259 | $ hg rebase -s 42ccdea3bb16 -d eea13746799a --collapse | |
|
260 | rebasing 1:42ccdea3bb16 "B" | |||
|
261 | rebasing 2:5fddd98957c8 "C" | |||
|
262 | rebasing 3:32af7686d403 "D" | |||
250 | $ hg log -G |
|
263 | $ hg log -G | |
251 | o 8:4dc2197e807b Collapsed revision |
|
264 | o 8:4dc2197e807b Collapsed revision | |
252 | | |
|
265 | | | |
@@ -299,7 +312,10 b' not be rebased.' | |||||
299 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
312 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
300 | $ cd hidden |
|
313 | $ cd hidden | |
301 | $ hg rebase -s 5fddd98957c8 -d eea13746799a |
|
314 | $ hg rebase -s 5fddd98957c8 -d eea13746799a | |
|
315 | rebasing 2:5fddd98957c8 "C" | |||
|
316 | rebasing 3:32af7686d403 "D" | |||
302 | $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe |
|
317 | $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe | |
|
318 | rebasing 1:42ccdea3bb16 "B" | |||
303 | $ hg log -G |
|
319 | $ hg log -G | |
304 | o 10:7c6027df6a99 B |
|
320 | o 10:7c6027df6a99 B | |
305 | | |
|
321 | | | |
@@ -351,6 +367,7 b' Test that rewriting leaving instability ' | |||||
351 | $ hg log -r 'children(8)' |
|
367 | $ hg log -r 'children(8)' | |
352 | 9:cf44d2f5a9f4 D (no-eol) |
|
368 | 9:cf44d2f5a9f4 D (no-eol) | |
353 | $ hg rebase -r 8 |
|
369 | $ hg rebase -r 8 | |
|
370 | rebasing 8:e273c5e7d2d2 "C" | |||
354 | $ hg log -G |
|
371 | $ hg log -G | |
355 | o 11:0d8f238b634c C |
|
372 | o 11:0d8f238b634c C | |
356 | | |
|
373 | | | |
@@ -376,6 +393,10 b' Test multiple root handling' | |||||
376 | ------------------------------------ |
|
393 | ------------------------------------ | |
377 |
|
394 | |||
378 | $ hg rebase --dest 4 --rev '7+11+9' |
|
395 | $ hg rebase --dest 4 --rev '7+11+9' | |
|
396 | rebasing 7:02de42196ebe "H" | |||
|
397 | rebasing 9:cf44d2f5a9f4 "D" | |||
|
398 | not rebasing ignored 10:7c6027df6a99 "B" | |||
|
399 | rebasing 11:0d8f238b634c "C" (tip) | |||
379 | $ hg log -G |
|
400 | $ hg log -G | |
380 | o 14:1e8370e38cca C |
|
401 | o 14:1e8370e38cca C | |
381 | | |
|
402 | | | |
@@ -442,6 +463,10 b' test on rebase dropping a merge' | |||||
442 | (actual test) |
|
463 | (actual test) | |
443 |
|
464 | |||
444 | $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)' |
|
465 | $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)' | |
|
466 | rebasing 3:32af7686d403 "D" | |||
|
467 | rebasing 7:02de42196ebe "H" | |||
|
468 | not rebasing ignored 8:53a6a128b2b7 "M" | |||
|
469 | rebasing 9:4bde274eefcf "I" (tip) | |||
445 |
$ |
|
470 | $ hg log -G | |
446 | @ 12:acd174b7ab39 I |
|
471 | @ 12:acd174b7ab39 I | |
447 | | |
|
472 | | |
@@ -120,6 +120,9 b' Rebase with no arguments (from 3 onto 8)' | |||||
120 | $ hg up -q -C 3 |
|
120 | $ hg up -q -C 3 | |
121 |
|
121 | |||
122 | $ hg rebase |
|
122 | $ hg rebase | |
|
123 | rebasing 1:42ccdea3bb16 "B" | |||
|
124 | rebasing 2:5fddd98957c8 "C" | |||
|
125 | rebasing 3:32af7686d403 "D" | |||
123 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
|
126 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) | |
124 |
|
127 | |||
125 | $ hg tglog |
|
128 | $ hg tglog | |
@@ -155,6 +158,9 b" Rebase with base == '.' => same as no ar" | |||||
155 | $ cd a2 |
|
158 | $ cd a2 | |
156 |
|
159 | |||
157 | $ hg rebase --base . |
|
160 | $ hg rebase --base . | |
|
161 | rebasing 1:42ccdea3bb16 "B" | |||
|
162 | rebasing 2:5fddd98957c8 "C" | |||
|
163 | rebasing 3:32af7686d403 "D" | |||
158 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
|
164 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) | |
159 |
|
165 | |||
160 | $ hg tglog |
|
166 | $ hg tglog | |
@@ -185,6 +191,9 b' Rebase with dest == branch(.) => same as' | |||||
185 | $ cd a3 |
|
191 | $ cd a3 | |
186 |
|
192 | |||
187 | $ hg rebase --dest 'branch(.)' |
|
193 | $ hg rebase --dest 'branch(.)' | |
|
194 | rebasing 1:42ccdea3bb16 "B" | |||
|
195 | rebasing 2:5fddd98957c8 "C" | |||
|
196 | rebasing 3:32af7686d403 "D" | |||
188 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
|
197 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) | |
189 |
|
198 | |||
190 | $ hg tglog |
|
199 | $ hg tglog | |
@@ -215,6 +224,8 b' Specify only source (from 2 onto 8):' | |||||
215 | $ cd a4 |
|
224 | $ cd a4 | |
216 |
|
225 | |||
217 | $ hg rebase --source 'desc("C")' |
|
226 | $ hg rebase --source 'desc("C")' | |
|
227 | rebasing 2:5fddd98957c8 "C" | |||
|
228 | rebasing 3:32af7686d403 "D" | |||
218 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
|
229 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob) | |
219 |
|
230 | |||
220 | $ hg tglog |
|
231 | $ hg tglog | |
@@ -245,6 +256,9 b' Specify only dest (from 3 onto 6):' | |||||
245 | $ cd a5 |
|
256 | $ cd a5 | |
246 |
|
257 | |||
247 | $ hg rebase --dest 6 |
|
258 | $ hg rebase --dest 6 | |
|
259 | rebasing 1:42ccdea3bb16 "B" | |||
|
260 | rebasing 2:5fddd98957c8 "C" | |||
|
261 | rebasing 3:32af7686d403 "D" | |||
248 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
|
262 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) | |
249 |
|
263 | |||
250 | $ hg tglog |
|
264 | $ hg tglog | |
@@ -275,6 +289,9 b' Specify only base (from 1 onto 8):' | |||||
275 | $ cd a6 |
|
289 | $ cd a6 | |
276 |
|
290 | |||
277 | $ hg rebase --base 'desc("D")' |
|
291 | $ hg rebase --base 'desc("D")' | |
|
292 | rebasing 1:42ccdea3bb16 "B" | |||
|
293 | rebasing 2:5fddd98957c8 "C" | |||
|
294 | rebasing 3:32af7686d403 "D" | |||
278 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
|
295 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) | |
279 |
|
296 | |||
280 | $ hg tglog |
|
297 | $ hg tglog | |
@@ -305,6 +322,8 b' Specify source and dest (from 2 onto 7):' | |||||
305 | $ cd a7 |
|
322 | $ cd a7 | |
306 |
|
323 | |||
307 | $ hg rebase --source 2 --dest 7 |
|
324 | $ hg rebase --source 2 --dest 7 | |
|
325 | rebasing 2:5fddd98957c8 "C" | |||
|
326 | rebasing 3:32af7686d403 "D" | |||
308 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
|
327 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) | |
309 |
|
328 | |||
310 | $ hg tglog |
|
329 | $ hg tglog | |
@@ -335,6 +354,9 b' Specify base and dest (from 1 onto 7):' | |||||
335 | $ cd a8 |
|
354 | $ cd a8 | |
336 |
|
355 | |||
337 | $ hg rebase --base 3 --dest 7 |
|
356 | $ hg rebase --base 3 --dest 7 | |
|
357 | rebasing 1:42ccdea3bb16 "B" | |||
|
358 | rebasing 2:5fddd98957c8 "C" | |||
|
359 | rebasing 3:32af7686d403 "D" | |||
338 | saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
|
360 | saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) | |
339 |
|
361 | |||
340 | $ hg tglog |
|
362 | $ hg tglog | |
@@ -365,6 +387,8 b' Specify only revs (from 2 onto 8)' | |||||
365 | $ cd a9 |
|
387 | $ cd a9 | |
366 |
|
388 | |||
367 | $ hg rebase --rev 'desc("C")::' |
|
389 | $ hg rebase --rev 'desc("C")::' | |
|
390 | rebasing 2:5fddd98957c8 "C" | |||
|
391 | rebasing 3:32af7686d403 "D" | |||
368 | saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
|
392 | saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-backup.hg (glob) | |
369 |
|
393 | |||
370 | $ hg tglog |
|
394 | $ hg tglog | |
@@ -413,6 +437,7 b' Test --tool parameter:' | |||||
413 | $ cd b1 |
|
437 | $ cd b1 | |
414 |
|
438 | |||
415 | $ hg rebase -s 2 -d 1 --tool internal:local |
|
439 | $ hg rebase -s 2 -d 1 --tool internal:local | |
|
440 | rebasing 2:e4e3f3546619 "c2b" (tip) | |||
416 | saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-backup.hg (glob) |
|
441 | saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-backup.hg (glob) | |
417 |
|
442 | |||
418 | $ hg cat c2 |
|
443 | $ hg cat c2 | |
@@ -425,6 +450,7 b' Test --tool parameter:' | |||||
425 | $ cd b2 |
|
450 | $ cd b2 | |
426 |
|
451 | |||
427 | $ hg rebase -s 2 -d 1 --tool internal:other |
|
452 | $ hg rebase -s 2 -d 1 --tool internal:other | |
|
453 | rebasing 2:e4e3f3546619 "c2b" (tip) | |||
428 | saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-backup.hg (glob) |
|
454 | saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-backup.hg (glob) | |
429 |
|
455 | |||
430 | $ hg cat c2 |
|
456 | $ hg cat c2 | |
@@ -437,6 +463,7 b' Test --tool parameter:' | |||||
437 | $ cd b3 |
|
463 | $ cd b3 | |
438 |
|
464 | |||
439 | $ hg rebase -s 2 -d 1 --tool internal:fail |
|
465 | $ hg rebase -s 2 -d 1 --tool internal:fail | |
|
466 | rebasing 2:e4e3f3546619 "c2b" (tip) | |||
440 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
467 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
441 | [1] |
|
468 | [1] | |
442 |
|
469 | |||
@@ -457,6 +484,7 b' Test --tool parameter:' | |||||
457 | (no more unresolved files) |
|
484 | (no more unresolved files) | |
458 | $ hg rebase -c --tool internal:fail |
|
485 | $ hg rebase -c --tool internal:fail | |
459 | tool option will be ignored |
|
486 | tool option will be ignored | |
|
487 | rebasing 2:e4e3f3546619 "c2b" (tip) | |||
460 | saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-backup.hg (glob) |
|
488 | saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-backup.hg (glob) | |
461 |
|
489 | |||
462 | $ hg rebase -i |
|
490 | $ hg rebase -i |
@@ -53,6 +53,7 b' Now b has one revision to be pulled from' | |||||
53 | adding manifests |
|
53 | adding manifests | |
54 | adding file changes |
|
54 | adding file changes | |
55 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
55 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
56 | rebasing 2:ff8d69a621f9 "L1" | |||
56 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-backup.hg (glob) |
|
57 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-backup.hg (glob) | |
57 |
|
58 | |||
58 | $ hg tglog |
|
59 | $ hg tglog | |
@@ -149,6 +150,7 b' pull --rebase works when a specific revi' | |||||
149 | adding manifests |
|
150 | adding manifests | |
150 | adding file changes |
|
151 | adding file changes | |
151 | added 2 changesets with 2 changes to 2 files |
|
152 | added 2 changesets with 2 changes to 2 files | |
|
153 | rebasing 3:ff8d69a621f9 "L1" | |||
152 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg (glob) |
|
154 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg (glob) | |
153 | $ hg tglog |
|
155 | $ hg tglog | |
154 | @ 5: 'L1' |
|
156 | @ 5: 'L1' |
@@ -60,6 +60,7 b' Rename is tracked:' | |||||
60 | Rebase the revision containing the rename: |
|
60 | Rebase the revision containing the rename: | |
61 |
|
61 | |||
62 | $ hg rebase -s 3 -d 2 |
|
62 | $ hg rebase -s 3 -d 2 | |
|
63 | rebasing 3:73a3ee40125d "rename A" (tip) | |||
63 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-backup.hg (glob) |
|
64 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-backup.hg (glob) | |
64 |
|
65 | |||
65 | $ hg tglog |
|
66 | $ hg tglog | |
@@ -150,6 +151,7 b' Copy is tracked:' | |||||
150 | Rebase the revision containing the copy: |
|
151 | Rebase the revision containing the copy: | |
151 |
|
152 | |||
152 | $ hg rebase -s 3 -d 2 |
|
153 | $ hg rebase -s 3 -d 2 | |
|
154 | rebasing 3:0a8162ff18a8 "copy A" (tip) | |||
153 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-backup.hg (glob) |
|
155 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-backup.hg (glob) | |
154 |
|
156 | |||
155 | $ hg tglog |
|
157 | $ hg tglog | |
@@ -233,6 +235,7 b' Test rebase across repeating renames:' | |||||
233 |
|
235 | |||
234 |
|
236 | |||
235 | $ hg rebase -s 4 -d 3 |
|
237 | $ hg rebase -s 4 -d 3 | |
|
238 | rebasing 4:b918d683b091 "Another unrelated change" (tip) | |||
236 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-backup.hg (glob) |
|
239 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-backup.hg (glob) | |
237 |
|
240 | |||
238 | $ hg diff --stat -c . |
|
241 | $ hg diff --stat -c . | |
@@ -281,6 +284,9 b' Update back to before we performed copie' | |||||
281 |
|
284 | |||
282 | Rebase the copies on top of the unrelated change. |
|
285 | Rebase the copies on top of the unrelated change. | |
283 | $ hg rebase --source 1 --dest 4 |
|
286 | $ hg rebase --source 1 --dest 4 | |
|
287 | rebasing 1:79d255d24ad2 "File b created as copy of a and modified" | |||
|
288 | rebasing 2:327f772bc074 "File c created as copy of b and modified" | |||
|
289 | rebasing 3:421b7e82bb85 "File d created as copy of c and modified" | |||
284 | saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-backup.hg (glob) |
|
290 | saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-backup.hg (glob) | |
285 | $ hg update 4 |
|
291 | $ hg update 4 | |
286 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
292 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -303,7 +309,10 b' copy records collapse correctly.' | |||||
303 | $ hg ci -m 'unrelated commit is unrelated' |
|
309 | $ hg ci -m 'unrelated commit is unrelated' | |
304 | created new head |
|
310 | created new head | |
305 | $ hg rebase -s 2 --dest 5 --collapse |
|
311 | $ hg rebase -s 2 --dest 5 --collapse | |
|
312 | rebasing 2:68bf06433839 "File b created as copy of a and modified" | |||
|
313 | rebasing 3:af74b229bc02 "File c created as copy of b and modified" | |||
306 | merging b and c to c |
|
314 | merging b and c to c | |
|
315 | rebasing 4:dbb9ba033561 "File d created as copy of c and modified" | |||
307 | merging c and d to d |
|
316 | merging c and d to d | |
308 | saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-backup.hg (glob) |
|
317 | saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-backup.hg (glob) | |
309 | $ hg co tip |
|
318 | $ hg co tip |
@@ -51,6 +51,7 b' D onto H - simple rebase:' | |||||
51 | $ hg status --rev "3^1" --rev 3 |
|
51 | $ hg status --rev "3^1" --rev 3 | |
52 | A D |
|
52 | A D | |
53 | $ HGEDITOR=cat hg rebase -s 3 -d 7 --edit |
|
53 | $ HGEDITOR=cat hg rebase -s 3 -d 7 --edit | |
|
54 | rebasing 3:32af7686d403 "D" | |||
54 | D |
|
55 | D | |
55 |
|
56 | |||
56 |
|
57 | |||
@@ -89,6 +90,7 b' D onto F - intermediate point:' | |||||
89 | $ cd a2 |
|
90 | $ cd a2 | |
90 |
|
91 | |||
91 | $ HGEDITOR=cat hg rebase -s 3 -d 5 |
|
92 | $ HGEDITOR=cat hg rebase -s 3 -d 5 | |
|
93 | rebasing 3:32af7686d403 "D" | |||
92 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-backup.hg (glob) |
|
94 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-backup.hg (glob) | |
93 |
|
95 | |||
94 | $ hg tglog |
|
96 | $ hg tglog | |
@@ -117,6 +119,8 b' E onto H - skip of G:' | |||||
117 | $ cd a3 |
|
119 | $ cd a3 | |
118 |
|
120 | |||
119 | $ hg rebase -s 4 -d 7 |
|
121 | $ hg rebase -s 4 -d 7 | |
|
122 | rebasing 4:9520eea781bc "E" | |||
|
123 | rebasing 6:eea13746799a "G" | |||
120 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-backup.hg (glob) |
|
124 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-backup.hg (glob) | |
121 |
|
125 | |||
122 | $ hg tglog |
|
126 | $ hg tglog | |
@@ -143,6 +147,9 b' F onto E - rebase of a branching point (' | |||||
143 | $ cd a4 |
|
147 | $ cd a4 | |
144 |
|
148 | |||
145 | $ hg rebase -s 5 -d 4 |
|
149 | $ hg rebase -s 5 -d 4 | |
|
150 | rebasing 5:24b6387c8c8c "F" | |||
|
151 | rebasing 6:eea13746799a "G" | |||
|
152 | rebasing 7:02de42196ebe "H" (tip) | |||
146 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-backup.hg (glob) |
|
153 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-backup.hg (glob) | |
147 |
|
154 | |||
148 | $ hg tglog |
|
155 | $ hg tglog | |
@@ -169,6 +176,7 b' G onto H - merged revision having a pare' | |||||
169 | $ cd a5 |
|
176 | $ cd a5 | |
170 |
|
177 | |||
171 | $ hg rebase -s 6 -d 7 |
|
178 | $ hg rebase -s 6 -d 7 | |
|
179 | rebasing 6:eea13746799a "G" | |||
172 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-backup.hg (glob) |
|
180 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-backup.hg (glob) | |
173 |
|
181 | |||
174 | $ hg tglog |
|
182 | $ hg tglog | |
@@ -197,6 +205,9 b' F onto B - G maintains E as parent:' | |||||
197 | $ cd a6 |
|
205 | $ cd a6 | |
198 |
|
206 | |||
199 | $ hg rebase -s 5 -d 1 |
|
207 | $ hg rebase -s 5 -d 1 | |
|
208 | rebasing 5:24b6387c8c8c "F" | |||
|
209 | rebasing 6:eea13746799a "G" | |||
|
210 | rebasing 7:02de42196ebe "H" (tip) | |||
200 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-backup.hg (glob) |
|
211 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-backup.hg (glob) | |
201 |
|
212 | |||
202 | $ hg tglog |
|
213 | $ hg tglog | |
@@ -239,6 +250,7 b' F onto G - rebase onto a descendant:' | |||||
239 | G onto B - merge revision with both parents not in ancestors of target: |
|
250 | G onto B - merge revision with both parents not in ancestors of target: | |
240 |
|
251 | |||
241 | $ hg rebase -s 6 -d 1 |
|
252 | $ hg rebase -s 6 -d 1 | |
|
253 | rebasing 6:eea13746799a "G" | |||
242 | abort: cannot use revision 6 as base, result would have 3 parents |
|
254 | abort: cannot use revision 6 as base, result would have 3 parents | |
243 | [255] |
|
255 | [255] | |
244 |
|
256 | |||
@@ -266,6 +278,8 b' F onto G - rebase onto a descendant:' | |||||
266 | C onto A - rebase onto an ancestor: |
|
278 | C onto A - rebase onto an ancestor: | |
267 |
|
279 | |||
268 | $ hg rebase -d 0 -s 2 |
|
280 | $ hg rebase -d 0 -s 2 | |
|
281 | rebasing 2:5fddd98957c8 "C" | |||
|
282 | rebasing 3:32af7686d403 "D" | |||
269 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
|
283 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) | |
270 | $ hg tglog |
|
284 | $ hg tglog | |
271 | o 7: 'D' |
|
285 | o 7: 'D' | |
@@ -297,32 +311,39 b' Check rebasing public changeset' | |||||
297 | [255] |
|
311 | [255] | |
298 |
|
312 | |||
299 | $ hg rebase -d 5 -b 6 --keep |
|
313 | $ hg rebase -d 5 -b 6 --keep | |
|
314 | rebasing 6:e1c4361dd923 "C" | |||
|
315 | rebasing 7:c9659aac0000 "D" (tip) | |||
300 |
|
316 | |||
301 | Check rebasing mutable changeset |
|
317 | Check rebasing mutable changeset | |
302 | Source phase greater or equal to destination phase: new changeset get the phase of source: |
|
318 | Source phase greater or equal to destination phase: new changeset get the phase of source: | |
303 | $ hg id -n |
|
319 | $ hg id -n | |
304 | 5 |
|
320 | 5 | |
305 | $ hg rebase -s9 -d0 |
|
321 | $ hg rebase -s9 -d0 | |
|
322 | rebasing 9:2b23e52411f4 "D" (tip) | |||
306 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg (glob) |
|
323 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg (glob) | |
307 | $ hg id -n # check we updated back to parent |
|
324 | $ hg id -n # check we updated back to parent | |
308 | 5 |
|
325 | 5 | |
309 | $ hg log --template "{phase}\n" -r 9 |
|
326 | $ hg log --template "{phase}\n" -r 9 | |
310 | draft |
|
327 | draft | |
311 | $ hg rebase -s9 -d1 |
|
328 | $ hg rebase -s9 -d1 | |
|
329 | rebasing 9:2cb10d0cfc6c "D" (tip) | |||
312 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg (glob) |
|
330 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg (glob) | |
313 | $ hg log --template "{phase}\n" -r 9 |
|
331 | $ hg log --template "{phase}\n" -r 9 | |
314 | draft |
|
332 | draft | |
315 | $ hg phase --force --secret 9 |
|
333 | $ hg phase --force --secret 9 | |
316 | $ hg rebase -s9 -d0 |
|
334 | $ hg rebase -s9 -d0 | |
|
335 | rebasing 9:c5b12b67163a "D" (tip) | |||
317 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg (glob) |
|
336 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg (glob) | |
318 | $ hg log --template "{phase}\n" -r 9 |
|
337 | $ hg log --template "{phase}\n" -r 9 | |
319 | secret |
|
338 | secret | |
320 | $ hg rebase -s9 -d1 |
|
339 | $ hg rebase -s9 -d1 | |
|
340 | rebasing 9:2a0524f868ac "D" (tip) | |||
321 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob) |
|
341 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob) | |
322 | $ hg log --template "{phase}\n" -r 9 |
|
342 | $ hg log --template "{phase}\n" -r 9 | |
323 | secret |
|
343 | secret | |
324 | Source phase lower than destination phase: new changeset get the phase of destination: |
|
344 | Source phase lower than destination phase: new changeset get the phase of destination: | |
325 | $ hg rebase -s8 -d9 |
|
345 | $ hg rebase -s8 -d9 | |
|
346 | rebasing 8:6d4f22462821 "C" | |||
326 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-backup.hg (glob) |
|
347 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-backup.hg (glob) | |
327 | $ hg log --template "{phase}\n" -r 'rev(9)' |
|
348 | $ hg log --template "{phase}\n" -r 'rev(9)' | |
328 | secret |
|
349 | secret | |
@@ -375,6 +396,11 b' Source on have two descendant heads but ' | |||||
375 | (use --keep to keep original changesets) |
|
396 | (use --keep to keep original changesets) | |
376 | [255] |
|
397 | [255] | |
377 | $ hg rebase -r '2::8' -d 1 --keep |
|
398 | $ hg rebase -r '2::8' -d 1 --keep | |
|
399 | rebasing 2:c9e50f6cdc55 "C" | |||
|
400 | rebasing 3:ffd453c31098 "D" | |||
|
401 | rebasing 6:3d8a618087a7 "G" | |||
|
402 | rebasing 7:72434a4e60b0 "H" | |||
|
403 | rebasing 8:479ddb54a924 "I" (tip) | |||
378 | $ hg tglog |
|
404 | $ hg tglog | |
379 | o 13: 'I' |
|
405 | o 13: 'I' | |
380 | | |
|
406 | | | |
@@ -416,6 +442,10 b' Base on have one descendant heads we ask' | |||||
416 | (use --keep to keep original changesets) |
|
442 | (use --keep to keep original changesets) | |
417 | [255] |
|
443 | [255] | |
418 | $ hg rebase -r '3::8' -d 1 --keep |
|
444 | $ hg rebase -r '3::8' -d 1 --keep | |
|
445 | rebasing 3:ffd453c31098 "D" | |||
|
446 | rebasing 6:3d8a618087a7 "G" | |||
|
447 | rebasing 7:72434a4e60b0 "H" | |||
|
448 | rebasing 8:479ddb54a924 "I" (tip) | |||
419 | $ hg tglog |
|
449 | $ hg tglog | |
420 | o 12: 'I' |
|
450 | o 12: 'I' | |
421 | | |
|
451 | | | |
@@ -455,6 +485,9 b' rebase subset' | |||||
455 | (use --keep to keep original changesets) |
|
485 | (use --keep to keep original changesets) | |
456 | [255] |
|
486 | [255] | |
457 | $ hg rebase -r '3::7' -d 1 --keep |
|
487 | $ hg rebase -r '3::7' -d 1 --keep | |
|
488 | rebasing 3:ffd453c31098 "D" | |||
|
489 | rebasing 6:3d8a618087a7 "G" | |||
|
490 | rebasing 7:72434a4e60b0 "H" | |||
458 | $ hg tglog |
|
491 | $ hg tglog | |
459 | o 11: 'H' |
|
492 | o 11: 'H' | |
460 | | |
|
493 | | | |
@@ -492,6 +525,11 b' rebase subset with multiple head' | |||||
492 | (use --keep to keep original changesets) |
|
525 | (use --keep to keep original changesets) | |
493 | [255] |
|
526 | [255] | |
494 | $ hg rebase -r '3::(7+5)' -d 1 --keep |
|
527 | $ hg rebase -r '3::(7+5)' -d 1 --keep | |
|
528 | rebasing 3:ffd453c31098 "D" | |||
|
529 | rebasing 4:c01897464e7f "E" | |||
|
530 | rebasing 5:41bfcc75ed73 "F" | |||
|
531 | rebasing 6:3d8a618087a7 "G" | |||
|
532 | rebasing 7:72434a4e60b0 "H" | |||
495 | $ hg tglog |
|
533 | $ hg tglog | |
496 | o 13: 'H' |
|
534 | o 13: 'H' | |
497 | | |
|
535 | | | |
@@ -531,6 +569,9 b' rebase on ancestor with revset' | |||||
531 | $ hg clone -q -u . ah ah5 |
|
569 | $ hg clone -q -u . ah ah5 | |
532 | $ cd ah5 |
|
570 | $ cd ah5 | |
533 | $ hg rebase -r '6::' -d 2 |
|
571 | $ hg rebase -r '6::' -d 2 | |
|
572 | rebasing 6:3d8a618087a7 "G" | |||
|
573 | rebasing 7:72434a4e60b0 "H" | |||
|
574 | rebasing 8:479ddb54a924 "I" (tip) | |||
534 | saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob) |
|
575 | saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob) | |
535 | $ hg tglog |
|
576 | $ hg tglog | |
536 | o 8: 'I' |
|
577 | o 8: 'I' | |
@@ -561,6 +602,11 b' We would expect heads are I, F if it was' | |||||
561 | $ hg clone -q -u . ah ah6 |
|
602 | $ hg clone -q -u . ah ah6 | |
562 | $ cd ah6 |
|
603 | $ cd ah6 | |
563 | $ hg rebase -r '(4+6)::' -d 1 |
|
604 | $ hg rebase -r '(4+6)::' -d 1 | |
|
605 | rebasing 4:c01897464e7f "E" | |||
|
606 | rebasing 5:41bfcc75ed73 "F" | |||
|
607 | rebasing 6:3d8a618087a7 "G" | |||
|
608 | rebasing 7:72434a4e60b0 "H" | |||
|
609 | rebasing 8:479ddb54a924 "I" (tip) | |||
564 | saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg (glob) |
|
610 | saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg (glob) | |
565 | $ hg tglog |
|
611 | $ hg tglog | |
566 | o 8: 'I' |
|
612 | o 8: 'I' | |
@@ -628,6 +674,8 b' each root have a different common ancest' | |||||
628 | (actual test) |
|
674 | (actual test) | |
629 |
|
675 | |||
630 | $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)' |
|
676 | $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)' | |
|
677 | rebasing 8:e7ec4e813ba6 "I" | |||
|
678 | rebasing 10:23a4ace37988 "K" (tip) | |||
631 | saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-backup.hg (glob) |
|
679 | saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-backup.hg (glob) | |
632 | $ hg log --rev 'children(desc(G))' |
|
680 | $ hg log --rev 'children(desc(G))' | |
633 | changeset: 9:adb617877056 |
|
681 | changeset: 9:adb617877056 | |
@@ -690,4 +738,6 b' Test that rebase is not confused by $CWD' | |||||
690 | $ hg add subfile |
|
738 | $ hg add subfile | |
691 | $ hg commit -m 'second source with subdir' |
|
739 | $ hg commit -m 'second source with subdir' | |
692 | $ hg rebase -b . -d 1 --traceback |
|
740 | $ hg rebase -b . -d 1 --traceback | |
|
741 | rebasing 2:779a07b1b7a0 "first source commit" | |||
|
742 | rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) | |||
693 | saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-backup.hg (glob) |
|
743 | saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-backup.hg (glob) |
@@ -110,6 +110,7 b' local edits should not prevent a shelved' | |||||
110 | unshelving change 'default-01' |
|
110 | unshelving change 'default-01' | |
111 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
111 | temporarily committing pending changes (restore with 'hg unshelve --abort') | |
112 | rebasing shelved changes |
|
112 | rebasing shelved changes | |
|
113 | rebasing 4:4702e8911fe0 "changes to '[mq]: second.patch'" (tip) | |||
113 | merging a/a |
|
114 | merging a/a | |
114 |
|
115 | |||
115 | $ hg revert --all -q |
|
116 | $ hg revert --all -q | |
@@ -202,6 +203,7 b' force a conflicted merge to occur' | |||||
202 | unshelving change 'default' |
|
203 | unshelving change 'default' | |
203 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
204 | temporarily committing pending changes (restore with 'hg unshelve --abort') | |
204 | rebasing shelved changes |
|
205 | rebasing shelved changes | |
|
206 | rebasing 5:4702e8911fe0 "changes to '[mq]: second.patch'" (tip) | |||
205 | merging a/a |
|
207 | merging a/a | |
206 | warning: conflicts during merge. |
|
208 | warning: conflicts during merge. | |
207 | merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
209 | merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -312,6 +314,7 b' attempt to continue' | |||||
312 | [255] |
|
314 | [255] | |
313 |
|
315 | |||
314 | $ hg unshelve -c |
|
316 | $ hg unshelve -c | |
|
317 | rebasing 5:4702e8911fe0 "changes to '[mq]: second.patch'" (tip) | |||
315 | unshelve of 'default' complete |
|
318 | unshelve of 'default' complete | |
316 |
|
319 | |||
317 | ensure the repo is as we hope |
|
320 | ensure the repo is as we hope | |
@@ -382,6 +385,7 b' if we resolve a conflict while unshelvin' | |||||
382 | unshelving change 'default' |
|
385 | unshelving change 'default' | |
383 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
386 | temporarily committing pending changes (restore with 'hg unshelve --abort') | |
384 | rebasing shelved changes |
|
387 | rebasing shelved changes | |
|
388 | rebasing 6:c5e6910e7601 "changes to 'second'" (tip) | |||
385 | merging a/a |
|
389 | merging a/a | |
386 | $ hg parents -q |
|
390 | $ hg parents -q | |
387 | 4:33f7f61e6c5e |
|
391 | 4:33f7f61e6c5e | |
@@ -461,11 +465,13 b' shelve should leave dirstate clean (issu' | |||||
461 | shelved as default |
|
465 | shelved as default | |
462 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
466 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
463 | $ hg rebase -d 1 --config extensions.rebase= |
|
467 | $ hg rebase -d 1 --config extensions.rebase= | |
|
468 | rebasing 2:323bfa07f744 "xyz" (tip) | |||
464 | merging x |
|
469 | merging x | |
465 | saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-backup.hg (glob) |
|
470 | saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-backup.hg (glob) | |
466 | $ hg unshelve |
|
471 | $ hg unshelve | |
467 | unshelving change 'default' |
|
472 | unshelving change 'default' | |
468 | rebasing shelved changes |
|
473 | rebasing shelved changes | |
|
474 | rebasing 4:b8fefe789ed0 "changes to 'xyz'" (tip) | |||
469 | $ hg status |
|
475 | $ hg status | |
470 | M z |
|
476 | M z | |
471 |
|
477 | |||
@@ -492,6 +498,7 b' shelve should only unshelve pending chan' | |||||
492 | $ hg unshelve |
|
498 | $ hg unshelve | |
493 | unshelving change 'default' |
|
499 | unshelving change 'default' | |
494 | rebasing shelved changes |
|
500 | rebasing shelved changes | |
|
501 | rebasing 3:0cae6656c016 "changes to 'c'" (tip) | |||
495 | $ hg status |
|
502 | $ hg status | |
496 | A d |
|
503 | A d | |
497 |
|
504 | |||
@@ -505,6 +512,7 b' unshelve should work on an ancestor of t' | |||||
505 | $ hg unshelve |
|
512 | $ hg unshelve | |
506 | unshelving change 'default' |
|
513 | unshelving change 'default' | |
507 | rebasing shelved changes |
|
514 | rebasing shelved changes | |
|
515 | rebasing 3:be58f65f55fb "changes to 'b'" (tip) | |||
508 | $ hg status |
|
516 | $ hg status | |
509 | A d |
|
517 | A d | |
510 |
|
518 | |||
@@ -602,6 +610,7 b' unshelve and conflicts with tracked and ' | |||||
602 | unshelving change 'default' |
|
610 | unshelving change 'default' | |
603 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
611 | temporarily committing pending changes (restore with 'hg unshelve --abort') | |
604 | rebasing shelved changes |
|
612 | rebasing shelved changes | |
|
613 | rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip) | |||
605 | merging f |
|
614 | merging f | |
606 | warning: conflicts during merge. |
|
615 | warning: conflicts during merge. | |
607 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
616 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -641,6 +650,7 b' unshelve and conflicts with tracked and ' | |||||
641 | unshelving change 'default' |
|
650 | unshelving change 'default' | |
642 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
651 | temporarily committing pending changes (restore with 'hg unshelve --abort') | |
643 | rebasing shelved changes |
|
652 | rebasing shelved changes | |
|
653 | rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip) | |||
644 | $ hg st |
|
654 | $ hg st | |
645 | M a |
|
655 | M a | |
646 | A f |
|
656 | A f | |
@@ -656,6 +666,7 b' unshelve and conflicts with tracked and ' | |||||
656 | $ hg unshelve |
|
666 | $ hg unshelve | |
657 | unshelving change 'default' |
|
667 | unshelving change 'default' | |
658 | rebasing shelved changes |
|
668 | rebasing shelved changes | |
|
669 | rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip) | |||
659 | merging f |
|
670 | merging f | |
660 | warning: conflicts during merge. |
|
671 | warning: conflicts during merge. | |
661 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
672 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -697,6 +708,7 b' Recreate some conflict again' | |||||
697 | $ hg unshelve |
|
708 | $ hg unshelve | |
698 | unshelving change 'default' |
|
709 | unshelving change 'default' | |
699 | rebasing shelved changes |
|
710 | rebasing shelved changes | |
|
711 | rebasing 5:4b555fdb4e96 "changes to 'second'" (tip) | |||
700 | merging a/a |
|
712 | merging a/a | |
701 | warning: conflicts during merge. |
|
713 | warning: conflicts during merge. | |
702 | merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
714 | merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark') | |
@@ -711,6 +723,7 b' is a no-op), works (issue4398)' | |||||
711 | $ hg resolve -m a/a |
|
723 | $ hg resolve -m a/a | |
712 | (no more unresolved files) |
|
724 | (no more unresolved files) | |
713 | $ hg unshelve -c |
|
725 | $ hg unshelve -c | |
|
726 | rebasing 5:4b555fdb4e96 "changes to 'second'" (tip) | |||
714 | unshelve of 'default' complete |
|
727 | unshelve of 'default' complete | |
715 | $ hg diff |
|
728 | $ hg diff | |
716 | $ hg status |
|
729 | $ hg status |
General Comments 0
You need to be logged in to leave comments.
Login now