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