Show More
@@ -139,7 +139,6 b' class rebaseruntime(object):' | |||
|
139 | 139 | # dict will be what contains most of the rebase progress state. |
|
140 | 140 | self.state = {} |
|
141 | 141 | self.activebookmark = None |
|
142 | self.currentbookmarks = None | |
|
143 | 142 | self.dest = None |
|
144 | 143 | self.skipped = set() |
|
145 | 144 | self.destancestors = set() |
@@ -364,8 +363,7 b' class rebaseruntime(object):' | |||
|
364 | 363 | self.destancestors = repo.changelog.ancestors([self.dest], |
|
365 | 364 | inclusive=True) |
|
366 | 365 | |
|
367 |
# Keep track of the |
|
|
368 | self.currentbookmarks = repo._bookmarks.copy() | |
|
366 | # Keep track of the active bookmarks in order to reset them later | |
|
369 | 367 | self.activebookmark = self.activebookmark or repo._activebookmark |
|
370 | 368 | if self.activebookmark: |
|
371 | 369 | bookmarks.deactivate(repo) |
@@ -498,19 +496,6 b' class rebaseruntime(object):' | |||
|
498 | 496 | if 'qtip' in repo.tags(): |
|
499 | 497 | updatemq(repo, self.state, self.skipped, **opts) |
|
500 | 498 | |
|
501 | if self.currentbookmarks: | |
|
502 | # Nodeids are needed to reset bookmarks | |
|
503 | nstate = {} | |
|
504 | for k, v in self.state.iteritems(): | |
|
505 | if v > nullmerge and v != k: | |
|
506 | nstate[repo[k].node()] = repo[v].node() | |
|
507 | elif v == revprecursor: | |
|
508 | succ = self.obsoletenotrebased[k] | |
|
509 | nstate[repo[k].node()] = repo[succ].node() | |
|
510 | # XXX this is the same as dest.node() for the non-continue path -- | |
|
511 | # this should probably be cleaned up | |
|
512 | destnode = repo[self.dest].node() | |
|
513 | ||
|
514 | 499 | # restore original working directory |
|
515 | 500 | # (we do this before stripping) |
|
516 | 501 | newwd = self.state.get(self.originalwd, self.originalwd) |
@@ -523,14 +508,6 b' class rebaseruntime(object):' | |||
|
523 | 508 | ui.note(_("update back to initial working directory parent\n")) |
|
524 | 509 | hg.updaterepo(repo, newwd, False) |
|
525 | 510 | |
|
526 | if self.currentbookmarks: | |
|
527 | with repo.transaction('bookmark') as tr: | |
|
528 | updatebookmarks(repo, destnode, nstate, | |
|
529 | self.currentbookmarks, tr) | |
|
530 | if self.activebookmark not in repo._bookmarks: | |
|
531 | # active bookmark was divergent one and has been deleted | |
|
532 | self.activebookmark = None | |
|
533 | ||
|
534 | 511 | if not self.keepf: |
|
535 | 512 | collapsedas = None |
|
536 | 513 | if self.collapsef: |
@@ -546,7 +523,7 b' class rebaseruntime(object):' | |||
|
546 | 523 | skippedlen = len(self.skipped) |
|
547 | 524 | ui.note(_("%d revisions have been skipped\n") % skippedlen) |
|
548 | 525 | |
|
549 | if (self.activebookmark and | |
|
526 | if (self.activebookmark and self.activebookmark in repo._bookmarks and | |
|
550 | 527 | repo['.'].node() == repo._bookmarks[self.activebookmark]): |
|
551 | 528 | bookmarks.activate(repo, self.activebookmark) |
|
552 | 529 | |
@@ -1089,16 +1066,6 b' def updatemq(repo, state, skipped, **opt' | |||
|
1089 | 1066 | mq.seriesdirty = True |
|
1090 | 1067 | mq.savedirty() |
|
1091 | 1068 | |
|
1092 | def updatebookmarks(repo, destnode, nstate, originalbookmarks, tr): | |
|
1093 | 'Move bookmarks to their correct changesets, and delete divergent ones' | |
|
1094 | marks = repo._bookmarks | |
|
1095 | for k, v in originalbookmarks.iteritems(): | |
|
1096 | if v in nstate: | |
|
1097 | # update the bookmarks for revs that have moved | |
|
1098 | marks[k] = nstate[v] | |
|
1099 | bookmarks.deletedivergent(repo, [destnode], k) | |
|
1100 | marks.recordchange(tr) | |
|
1101 | ||
|
1102 | 1069 | def storecollapsemsg(repo, collapsemsg): |
|
1103 | 1070 | 'Store the collapse message to allow recovery' |
|
1104 | 1071 | collapsemsg = collapsemsg or '' |
@@ -1325,34 +1292,19 b' def clearrebased(ui, repo, state, skippe' | |||
|
1325 | 1292 | |
|
1326 | 1293 | If `collapsedas` is not None, the rebase was a collapse whose result if the |
|
1327 | 1294 | `collapsedas` node.""" |
|
1328 | if obsolete.isenabled(repo, obsolete.createmarkersopt): | |
|
1329 | markers = [] | |
|
1295 | tonode = repo.changelog.node | |
|
1296 | mapping = {} | |
|
1297 | if True: | |
|
1330 | 1298 | for rev, newrev in sorted(state.items()): |
|
1331 | 1299 | if newrev >= 0 and newrev != rev: |
|
1332 | 1300 | if rev in skipped: |
|
1333 | 1301 | succs = () |
|
1334 | 1302 | elif collapsedas is not None: |
|
1335 |
succs = ( |
|
|
1303 | succs = (collapsedas,) | |
|
1336 | 1304 | else: |
|
1337 |
succs = ( |
|
|
1338 |
ma |
|
|
1339 | if markers: | |
|
1340 | obsolete.createmarkers(repo, markers, operation='rebase') | |
|
1341 | else: | |
|
1342 | rebased = [rev for rev in state | |
|
1343 | if state[rev] > nullmerge and state[rev] != rev] | |
|
1344 | if rebased: | |
|
1345 | stripped = [] | |
|
1346 | for root in repo.set('roots(%ld)', rebased): | |
|
1347 | if set(repo.changelog.descendants([root.rev()])) - set(state): | |
|
1348 | ui.warn(_("warning: new changesets detected " | |
|
1349 | "on source branch, not stripping\n")) | |
|
1350 | else: | |
|
1351 | stripped.append(root.node()) | |
|
1352 | if stripped: | |
|
1353 | # backup the old csets by default | |
|
1354 | repair.strip(ui, repo, stripped, "all") | |
|
1355 | ||
|
1305 | succs = (tonode(newrev),) | |
|
1306 | mapping[tonode(rev)] = succs | |
|
1307 | scmutil.cleanupnodes(repo, mapping, 'rebase') | |
|
1356 | 1308 | |
|
1357 | 1309 | def pullrebase(orig, ui, repo, *args, **opts): |
|
1358 | 1310 | 'Call rebase after pull if the latter has been invoked with --rebase' |
@@ -38,7 +38,7 b' rebase' | |||
|
38 | 38 | |
|
39 | 39 | $ hg rebase -s two -d one |
|
40 | 40 | rebasing 3:2ae46b1d99a7 "3" (tip two) |
|
41 |
saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc- |
|
|
41 | saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg (glob) | |
|
42 | 42 | |
|
43 | 43 | $ hg log |
|
44 | 44 | changeset: 3:42e5ed2cdcf4 |
@@ -119,7 +119,7 b' Verify disabling copy tracing still keep' | |||
|
119 | 119 | |
|
120 | 120 | $ hg rebase -d . -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True |
|
121 | 121 | rebasing 2:6adcf8c12e7d "copy b->x" |
|
122 |
saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75- |
|
|
122 | saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-rebase.hg (glob) | |
|
123 | 123 | $ hg up -q 3 |
|
124 | 124 | $ hg log -f x -T '{rev} {desc}\n' |
|
125 | 125 | 3 copy b->x |
@@ -152,7 +152,7 b' Verify we duplicate existing copies, ins' | |||
|
152 | 152 | |
|
153 | 153 | $ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.disablecopytrace=True |
|
154 | 154 | rebasing 3:47e1a9e6273b "copy a->b (2)" (tip) |
|
155 |
saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59- |
|
|
155 | saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg (glob) | |
|
156 | 156 | |
|
157 | 157 | $ hg log -G -f b |
|
158 | 158 | @ changeset: 3:76024fb4b05b |
@@ -1205,7 +1205,7 b' rebased or not.' | |||
|
1205 | 1205 | Invoking status precommit hook |
|
1206 | 1206 | M sub/normal4 |
|
1207 | 1207 | M sub2/large6 |
|
1208 |
saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-dd1d9f80- |
|
|
1208 | saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-dd1d9f80-rebase.hg (glob) | |
|
1209 | 1209 | 0 largefiles cached |
|
1210 | 1210 | $ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ] |
|
1211 | 1211 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
@@ -1264,7 +1264,7 b' rebased or not.' | |||
|
1264 | 1264 | Invoking status precommit hook |
|
1265 | 1265 | M sub/normal4 |
|
1266 | 1266 | M sub2/large6 |
|
1267 |
saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-dd1d9f80- |
|
|
1267 | saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-dd1d9f80-rebase.hg (glob) | |
|
1268 | 1268 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
|
1269 | 1269 | 9:598410d3eb9a modify normal file largefile in repo d |
|
1270 | 1270 | 8:a381d2c8c80e modify normal file and largefile in repo b |
@@ -75,7 +75,7 b' Test deleting divergent bookmarks from d' | |||
|
75 | 75 | |
|
76 | 76 | $ hg rebase -s Y -d 3 |
|
77 | 77 | rebasing 2:49cb3485fa0c "C" (Y Z) |
|
78 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97- |
|
|
78 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg (glob) | |
|
79 | 79 | |
|
80 | 80 | $ hg tglog |
|
81 | 81 | @ 3: 'C' bookmarks: Y Z |
@@ -97,7 +97,7 b' Do not try to keep active but deleted di' | |||
|
97 | 97 | |
|
98 | 98 | $ hg rebase -s W -d . |
|
99 | 99 | rebasing 3:41acb9dca9eb "D" (tip W) |
|
100 |
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63- |
|
|
100 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg (glob) | |
|
101 | 101 | |
|
102 | 102 | $ hg bookmarks |
|
103 | 103 | W 3:0d3554f74897 |
@@ -116,7 +116,7 b' Keep bookmarks to the correct rebased ch' | |||
|
116 | 116 | $ hg rebase -s 1 -d 3 |
|
117 | 117 | rebasing 1:6c81ed0049f8 "B" (X) |
|
118 | 118 | rebasing 2:49cb3485fa0c "C" (Y Z) |
|
119 |
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f- |
|
|
119 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob) | |
|
120 | 120 | |
|
121 | 121 | $ hg tglog |
|
122 | 122 | @ 3: 'C' bookmarks: Y Z |
@@ -139,7 +139,7 b' Keep active bookmark on the correct chan' | |||
|
139 | 139 | $ hg rebase -d W |
|
140 | 140 | rebasing 1:6c81ed0049f8 "B" (X) |
|
141 | 141 | rebasing 2:49cb3485fa0c "C" (Y Z) |
|
142 |
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f- |
|
|
142 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob) | |
|
143 | 143 | |
|
144 | 144 | $ hg tglog |
|
145 | 145 | o 3: 'C' bookmarks: Y Z |
@@ -179,7 +179,7 b' rebase --continue with bookmarks present' | |||
|
179 | 179 | continue: hg rebase --continue |
|
180 | 180 | $ hg rebase --continue |
|
181 | 181 | rebasing 3:3d5fa227f4b5 "C" (Y Z) |
|
182 |
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371- |
|
|
182 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg (glob) | |
|
183 | 183 | $ hg tglog |
|
184 | 184 | @ 4: 'C' bookmarks: Y Z |
|
185 | 185 | | |
@@ -209,4 +209,4 b' as --rev arguments (issue3950)' | |||
|
209 | 209 | rebasing 5:345c90f326a4 "bisect" |
|
210 | 210 | rebasing 6:f677a2907404 "bisect2" |
|
211 | 211 | rebasing 7:325c16001345 "bisect3" (tip bisect) |
|
212 |
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586- |
|
|
212 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg (glob) |
@@ -104,7 +104,7 b' Rebase part of branch2 (5-6) onto branch' | |||
|
104 | 104 | $ hg rebase -s 5 -d 8 |
|
105 | 105 | rebasing 5:635859577d0b "D" |
|
106 | 106 | rebasing 6:5097051d331d "E" |
|
107 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-89160bff- |
|
|
107 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-89160bff-rebase.hg (glob) | |
|
108 | 108 | |
|
109 | 109 | $ hg branches |
|
110 | 110 | branch3 8:466cdfb14b62 |
@@ -166,7 +166,7 b' Rebase head of branch3 (8) onto branch2 ' | |||
|
166 | 166 | |
|
167 | 167 | $ hg rebase -s 8 -d 6 |
|
168 | 168 | rebasing 8:4666b71e8e32 "F" (tip) |
|
169 |
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96- |
|
|
169 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg (glob) | |
|
170 | 170 | |
|
171 | 171 | $ hg branches |
|
172 | 172 | branch2 8:6b4bdc1b5ac0 |
@@ -233,7 +233,7 b' Rebase entire branch3 (7-8) onto branch2' | |||
|
233 | 233 | rebasing 7:653b9feb4616 "branch3" |
|
234 | 234 | note: rebase of 7:653b9feb4616 created no changes to commit |
|
235 | 235 | rebasing 8:4666b71e8e32 "F" (tip) |
|
236 |
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16- |
|
|
236 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg (glob) | |
|
237 | 237 | |
|
238 | 238 | $ hg branches |
|
239 | 239 | branch2 7:6b4bdc1b5ac0 |
@@ -480,4 +480,4 b' Turn most changeset public' | |||
|
480 | 480 | HGEDITFORM=rebase.merge |
|
481 | 481 | rebasing 8:326cfedc031c "I" (tip) |
|
482 | 482 | HGEDITFORM=rebase.normal |
|
483 |
saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0- |
|
|
483 | saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg (glob) |
@@ -138,7 +138,7 b' Solve the conflict and go on:' | |||
|
138 | 138 | continue: hg rebase --continue |
|
139 | 139 | $ hg rebase --continue |
|
140 | 140 | rebasing 5:01e6ebbd8272 "F" (tip) |
|
141 |
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015- |
|
|
141 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-rebase.hg (glob) | |
|
142 | 142 | |
|
143 | 143 | $ hg tglog |
|
144 | 144 | @ 5:draft 'F' notdefault |
@@ -78,7 +78,7 b' Rebasing B onto H and collapsing changes' | |||
|
78 | 78 | HG: added C |
|
79 | 79 | HG: added D |
|
80 | 80 | ==== |
|
81 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3- |
|
|
81 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) | |
|
82 | 82 | |
|
83 | 83 | $ hg tglogp |
|
84 | 84 | @ 5:secret 'Collapsed revision |
@@ -118,7 +118,7 b' Rebasing E onto H:' | |||
|
118 | 118 | $ hg rebase --source 4 --collapse --dest 7 |
|
119 | 119 | rebasing 4:9520eea781bc "E" |
|
120 | 120 | rebasing 6:eea13746799a "G" |
|
121 |
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4- |
|
|
121 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob) | |
|
122 | 122 | |
|
123 | 123 | $ hg tglog |
|
124 | 124 | o 6: 'Collapsed revision |
@@ -161,7 +161,7 b' Rebasing G onto H with custom message:' | |||
|
161 | 161 | rebasing 4:9520eea781bc "E" |
|
162 | 162 | rebasing 6:eea13746799a "G" |
|
163 | 163 | HGEDITFORM=rebase.collapse |
|
164 |
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4- |
|
|
164 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob) | |
|
165 | 165 | |
|
166 | 166 | $ hg tglog |
|
167 | 167 | o 6: 'custom message' |
@@ -271,7 +271,7 b' Rebase and collapse - E onto H:' | |||
|
271 | 271 | rebasing 4:8a5212ebc852 "E" |
|
272 | 272 | rebasing 5:7f219660301f "F" |
|
273 | 273 | rebasing 6:c772a8b2dc17 "G" |
|
274 |
saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61- |
|
|
274 | saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-rebase.hg (glob) | |
|
275 | 275 | |
|
276 | 276 | $ hg tglog |
|
277 | 277 | o 5: 'Collapsed revision |
@@ -424,7 +424,7 b' Rebase and collapse - E onto I:' | |||
|
424 | 424 | merging E |
|
425 | 425 | rebasing 6:55a44ad28289 "G" |
|
426 | 426 | rebasing 7:417d3b648079 "H" |
|
427 |
saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879- |
|
|
427 | saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-rebase.hg (glob) | |
|
428 | 428 | |
|
429 | 429 | $ hg tglog |
|
430 | 430 | o 5: 'Collapsed revision |
@@ -517,7 +517,7 b' Rebase and collapse - B onto F:' | |||
|
517 | 517 | rebasing 2:f838bfaca5c7 "C" |
|
518 | 518 | rebasing 3:7bbcd6078bcc "D" |
|
519 | 519 | rebasing 4:0a42590ed746 "E" |
|
520 |
saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92- |
|
|
520 | saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-rebase.hg (glob) | |
|
521 | 521 | |
|
522 | 522 | $ hg tglog |
|
523 | 523 | o 2: 'Collapsed revision |
@@ -602,7 +602,7 b' Interactions between collapse and keepbr' | |||
|
602 | 602 | $ hg rebase -s 5 -d 4 |
|
603 | 603 | rebasing 5:fbfb97b1089a "E" (tip) |
|
604 | 604 | note: rebase of 5:fbfb97b1089a created no changes to commit |
|
605 |
saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85- |
|
|
605 | saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg (glob) | |
|
606 | 606 | $ hg tglog |
|
607 | 607 | @ 4: 'E' |
|
608 | 608 | | |
@@ -660,7 +660,7 b' Rebase, collapse and copies' | |||
|
660 | 660 | rebasing 3:338e84e2e558 "move2" (tip) |
|
661 | 661 | merging f and c to c |
|
662 | 662 | merging e and g to g |
|
663 |
saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003- |
|
|
663 | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-rebase.hg (glob) | |
|
664 | 664 | $ hg st |
|
665 | 665 | $ hg st --copies --change tip |
|
666 | 666 | A d |
@@ -701,7 +701,7 b' Test collapsing in place' | |||
|
701 | 701 | $ hg rebase --collapse -b . -d 0 |
|
702 | 702 | rebasing 1:1352765a01d4 "change" |
|
703 | 703 | rebasing 2:64b456429f67 "Collapsed revision" (tip) |
|
704 |
saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea- |
|
|
704 | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg (glob) | |
|
705 | 705 | $ hg st --change tip --copies |
|
706 | 706 | M a |
|
707 | 707 | M c |
@@ -793,7 +793,7 b' Test collapsing changes that add then re' | |||
|
793 | 793 | $ hg rebase -d 0 -r "1::2" --collapse -m collapsed |
|
794 | 794 | rebasing 1:6d8d9f24eec3 "a" |
|
795 | 795 | rebasing 2:1cc73eca5ecc "b" (tip foo) |
|
796 |
saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2- |
|
|
796 | saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg (glob) | |
|
797 | 797 | $ hg log -G --template "{rev}: '{desc}' {bookmarks}" |
|
798 | 798 | @ 1: 'collapsed' foo |
|
799 | 799 | | |
@@ -834,7 +834,7 b' running into merge conflict and invoking' | |||
|
834 | 834 | continue: hg rebase --continue |
|
835 | 835 | $ hg rebase --continue |
|
836 | 836 | rebasing 2:b8d8db2b242d "a-dev" (tip) |
|
837 |
saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/b8d8db2b242d-f474c19a- |
|
|
837 | saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/b8d8db2b242d-f474c19a-rebase.hg (glob) | |
|
838 | 838 | $ hg log |
|
839 | 839 | changeset: 2:45ba1d1a8665 |
|
840 | 840 | tag: tip |
@@ -87,7 +87,7 b' Conclude rebase:' | |||
|
87 | 87 | already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
|
88 | 88 | rebasing 4:46f0b057b5c0 "L2" |
|
89 | 89 | rebasing 5:8029388f38dc "L3" (mybook) |
|
90 |
saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e- |
|
|
90 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg (glob) | |
|
91 | 91 | |
|
92 | 92 | $ hg tglog |
|
93 | 93 | @ 5:secret 'L3' mybook |
@@ -287,7 +287,7 b' Check that the right ancestors is used w' | |||
|
287 | 287 | bundle2-output-bundle: "HG20", (1 params) 2 parts total |
|
288 | 288 | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
|
289 | 289 | bundle2-output-part: "phase-heads" 24 bytes payload |
|
290 |
saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814- |
|
|
290 | saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg (glob) | |
|
291 | 291 | 3 changesets found |
|
292 | 292 | list of changesets: |
|
293 | 293 | 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |
@@ -400,16 +400,20 b' Test rebase with obsstore turned on and ' | |||
|
400 | 400 | rebasing 1:112478962961 "B" (B) |
|
401 | 401 | not rebasing ignored 2:26805aba1e60 "C" (C) |
|
402 | 402 | rebasing 3:f585351a92f8 "D" (D) |
|
403 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-cb2a9b47-backup.hg (glob) | |
|
403 | warning: orphaned descendants detected, not stripping 112478962961 | |
|
404 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob) | |
|
404 | 405 | |
|
405 | 406 | $ rm .hg/localtags |
|
406 | 407 | $ hg tglog |
|
407 |
o |
|
|
408 | o 5:draft 'D' | |
|
409 | | | |
|
410 | o 4:draft 'B' | |
|
408 | 411 | | |
|
409 |
|
|
|
412 | @ 3:draft 'E' | |
|
410 | 413 | | |
|
411 |
|
|
|
412 | | | |
|
414 | | o 2:draft 'C' | |
|
415 | | | | |
|
416 | | o 1:draft 'B' | |
|
417 | |/ | |
|
413 | 418 | o 0:draft 'A' |
|
414 | 419 | |
|
415 | Note the above graph is wrong since C got stripped incorrectly. |
@@ -21,15 +21,15 b' Require a destination' | |||
|
21 | 21 | [255] |
|
22 | 22 | $ hg rebase -d 1 |
|
23 | 23 | rebasing 2:5db65b93a12b "cc" (tip) |
|
24 |
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec- |
|
|
24 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-rebase.hg (glob) | |
|
25 | 25 | $ hg rebase -d 0 -r . -q |
|
26 | 26 | $ HGPLAIN=1 hg rebase |
|
27 | 27 | rebasing 2:889b0bc6a730 "cc" (tip) |
|
28 |
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81- |
|
|
28 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-rebase.hg (glob) | |
|
29 | 29 | $ hg rebase -d 0 -r . -q |
|
30 | 30 | $ hg --config commands.rebase.requiredest=False rebase |
|
31 | 31 | rebasing 2:279de9495438 "cc" (tip) |
|
32 |
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128- |
|
|
32 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-rebase.hg (glob) | |
|
33 | 33 | |
|
34 | 34 | Requiring dest should not break continue or other rebase options |
|
35 | 35 | $ hg up 1 -q |
@@ -56,7 +56,7 b' Requiring dest should not break continue' | |||
|
56 | 56 | continue: hg rebase --continue |
|
57 | 57 | $ hg rebase --continue |
|
58 | 58 | rebasing 3:0537f6b50def "dc" (tip) |
|
59 |
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386- |
|
|
59 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg (glob) | |
|
60 | 60 | |
|
61 | 61 | $ cd .. |
|
62 | 62 |
@@ -49,7 +49,7 b' Rebasing D onto H detaching from C:' | |||
|
49 | 49 | $ hg phase --force --secret 3 |
|
50 | 50 | $ hg rebase -s 3 -d 7 |
|
51 | 51 | rebasing 3:32af7686d403 "D" |
|
52 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface- |
|
|
52 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob) | |
|
53 | 53 | |
|
54 | 54 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
|
55 | 55 | o 7:secret 'D' |
@@ -102,7 +102,7 b' Rebasing C onto H detaching from B:' | |||
|
102 | 102 | $ hg rebase -s 2 -d 7 |
|
103 | 103 | rebasing 2:5fddd98957c8 "C" |
|
104 | 104 | rebasing 3:32af7686d403 "D" |
|
105 |
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-f9244fa1- |
|
|
105 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) | |
|
106 | 106 | |
|
107 | 107 | $ hg tglog |
|
108 | 108 | o 7: 'D' |
@@ -157,7 +157,7 b' Rebasing B onto H using detach (same as ' | |||
|
157 | 157 | rebasing 1:42ccdea3bb16 "B" |
|
158 | 158 | rebasing 2:5fddd98957c8 "C" |
|
159 | 159 | rebasing 3:32af7686d403 "D" |
|
160 |
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3- |
|
|
160 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) | |
|
161 | 161 | |
|
162 | 162 | $ hg tglog |
|
163 | 163 | o 7: 'D' |
@@ -213,7 +213,7 b' Rebasing C onto H detaching from B and c' | |||
|
213 | 213 | $ hg rebase --collapse -s 2 -d 7 |
|
214 | 214 | rebasing 2:5fddd98957c8 "C" |
|
215 | 215 | rebasing 3:32af7686d403 "D" |
|
216 |
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1- |
|
|
216 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) | |
|
217 | 217 | |
|
218 | 218 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
|
219 | 219 | o 6:secret 'Collapsed revision |
@@ -275,7 +275,7 b' Rebasing across null as ancestor' | |||
|
275 | 275 | rebasing 1:42ccdea3bb16 "B" |
|
276 | 276 | rebasing 2:5fddd98957c8 "C" |
|
277 | 277 | rebasing 3:32af7686d403 "D" |
|
278 |
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3- |
|
|
278 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) | |
|
279 | 279 | |
|
280 | 280 | $ hg tglog |
|
281 | 281 | o 8: 'D' |
@@ -300,7 +300,7 b' Rebasing across null as ancestor' | |||
|
300 | 300 | $ hg rebase -d 5 -s 7 |
|
301 | 301 | rebasing 7:13547172c9c0 "C" |
|
302 | 302 | rebasing 8:4e27a76c371a "D" (tip) |
|
303 |
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-35685ded- |
|
|
303 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-35685ded-rebase.hg (glob) | |
|
304 | 304 | $ hg tglog |
|
305 | 305 | o 8: 'D' |
|
306 | 306 | | |
@@ -341,7 +341,7 b' Verify that target is not selected as ex' | |||
|
341 | 341 | rebasing 8:9790e768172d "I" |
|
342 | 342 | rebasing 9:5d7b11f5fb97 "Merge" |
|
343 | 343 | rebasing 10:9427d4d5af81 "J" (tip) |
|
344 |
saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-c2111e9d- |
|
|
344 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-c2111e9d-rebase.hg (glob) | |
|
345 | 345 | |
|
346 | 346 | $ hg tglog |
|
347 | 347 | @ 8: 'Collapsed revision |
@@ -395,7 +395,7 b' Ensure --continue restores a correct sta' | |||
|
395 | 395 | $ hg rebase -c |
|
396 | 396 | rebasing 8:6215fafa5447 "H2" (tip) |
|
397 | 397 | note: rebase of 8:6215fafa5447 created no changes to commit |
|
398 |
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-5804ebd5- |
|
|
398 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-5804ebd5-rebase.hg (glob) | |
|
399 | 399 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
|
400 | 400 | @ 7:draft 'H' |
|
401 | 401 | | |
@@ -112,7 +112,7 b' Solve the conflict and go on:' | |||
|
112 | 112 | $ hg rebase --continue |
|
113 | 113 | already rebased 1:27547f69f254 "B" as 45396c49d53b |
|
114 | 114 | rebasing 2:965c486023db "C" |
|
115 | warning: new changesets detected on source branch, not stripping | |
|
115 | warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db | |
|
116 | 116 | |
|
117 | 117 | $ hg tglogp |
|
118 | 118 | o 7:draft 'C' |
@@ -311,7 +311,7 b' Test rebase interrupted by hooks' | |||
|
311 | 311 | $ hg rebase --continue |
|
312 | 312 | already rebased 2:965c486023db "C" as 401ccec5e39f |
|
313 | 313 | rebasing 6:a0b2430ebfb8 "F" |
|
314 |
saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7- |
|
|
314 | saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob) | |
|
315 | 315 | $ hg tglogp |
|
316 | 316 | @ 6:secret 'F' |
|
317 | 317 | | |
@@ -366,7 +366,7 b' Test rebase interrupted by hooks' | |||
|
366 | 366 | $ hg rebase --continue |
|
367 | 367 | already rebased 2:965c486023db "C" as 401ccec5e39f |
|
368 | 368 | rebasing 6:a0b2430ebfb8 "F" |
|
369 |
saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7- |
|
|
369 | saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob) | |
|
370 | 370 | $ hg tglogp |
|
371 | 371 | @ 6:secret 'F' |
|
372 | 372 | | |
@@ -416,7 +416,7 b' Test rebase interrupted by hooks' | |||
|
416 | 416 | $ hg rebase --continue |
|
417 | 417 | already rebased 2:965c486023db "C" as 401ccec5e39f |
|
418 | 418 | rebasing 6:a0b2430ebfb8 "F" |
|
419 |
saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7- |
|
|
419 | saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob) | |
|
420 | 420 | $ hg tglogp |
|
421 | 421 | @ 6:secret 'F' |
|
422 | 422 | | |
@@ -459,7 +459,7 b' Make sure merge state is cleaned up afte' | |||
|
459 | 459 | $ hg rebase --continue |
|
460 | 460 | rebasing 1:fdaca8533b86 "b" |
|
461 | 461 | note: rebase of 1:fdaca8533b86 created no changes to commit |
|
462 |
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513- |
|
|
462 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg (glob) | |
|
463 | 463 | $ hg resolve --list |
|
464 | 464 | $ test -f .hg/merge |
|
465 | 465 | [1] |
@@ -53,7 +53,7 b' Rebase with no arguments - single revisi' | |||
|
53 | 53 | |
|
54 | 54 | $ hg rebase |
|
55 | 55 | rebasing 2:87c180a611f2 "l1" |
|
56 |
saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d- |
|
|
56 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg (glob) | |
|
57 | 57 | |
|
58 | 58 | $ hg tglog |
|
59 | 59 | @ 4: 'l1' |
@@ -113,7 +113,7 b' Rebase with no arguments - single revisi' | |||
|
113 | 113 | $ hg rebase |
|
114 | 114 | rebasing 2:87c180a611f2 "l1" |
|
115 | 115 | rebasing 3:1ac923b736ef "l2" |
|
116 |
saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c- |
|
|
116 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg (glob) | |
|
117 | 117 | |
|
118 | 118 | $ hg tglog |
|
119 | 119 | @ 4: 'l2' |
@@ -74,7 +74,7 b' already has one local mq patch' | |||
|
74 | 74 | 324 (manifests) |
|
75 | 75 | 129 p0 |
|
76 | 76 | 129 p1 |
|
77 |
saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb- |
|
|
77 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-rebase.hg (glob) | |
|
78 | 78 | 2 changesets found |
|
79 | 79 | uncompressed size of bundle content: |
|
80 | 80 | 403 (changelog) |
@@ -166,7 +166,7 b' already has one local mq patch' | |||
|
166 | 166 | rebasing 5:681a378595ba "r5" (r5) |
|
167 | 167 | rebasing 6:512a1f24768b "r6" (qtip r6) |
|
168 | 168 | note: rebase of 6:512a1f24768b created no changes to commit |
|
169 |
saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d- |
|
|
169 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg (glob) | |
|
170 | 170 | |
|
171 | 171 | $ hg tglog |
|
172 | 172 | @ 8: 'r5' tags: qtip r5 tip |
@@ -88,7 +88,7 b' Fix the 2nd conflict:' | |||
|
88 | 88 | $ hg rebase -c |
|
89 | 89 | already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c |
|
90 | 90 | rebasing 3:929394423cd3 "P1" (f2.patch qtip) |
|
91 |
saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40- |
|
|
91 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg (glob) | |
|
92 | 92 | |
|
93 | 93 | $ hg tglog |
|
94 | 94 | @ 3: 'P1' tags: f2.patch qtip tip |
@@ -205,7 +205,7 b' Rebase the applied mq patches:' | |||
|
205 | 205 | $ hg rebase -s 2 -d 1 |
|
206 | 206 | rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase) |
|
207 | 207 | rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip) |
|
208 |
saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f- |
|
|
208 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-rebase.hg (glob) | |
|
209 | 209 | |
|
210 | 210 | $ hg qci -m 'save patch state' |
|
211 | 211 |
@@ -72,7 +72,7 b' Branch name containing a dash (issue3181' | |||
|
72 | 72 | rebasing 6:eea13746799a "G" |
|
73 | 73 | rebasing 7:02de42196ebe "H" |
|
74 | 74 | rebasing 9:cb039b7cae8e "dev-two named branch" (tip) |
|
75 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001- |
|
|
75 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg (glob) | |
|
76 | 76 | |
|
77 | 77 | $ hg tglog |
|
78 | 78 | @ 9: 'dev-two named branch' dev-two |
@@ -101,7 +101,7 b' Branch name containing a dash (issue3181' | |||
|
101 | 101 | rebasing 7:4b988a958030 "G" |
|
102 | 102 | rebasing 8:31d0e4ba75e6 "H" |
|
103 | 103 | rebasing 9:9e70cd31750f "dev-two named branch" (tip) |
|
104 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5- |
|
|
104 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg (glob) | |
|
105 | 105 | |
|
106 | 106 | $ hg tglog |
|
107 | 107 | @ 9: 'dev-two named branch' dev-two |
@@ -161,7 +161,7 b' Branch name containing a dash (issue3181' | |||
|
161 | 161 | rebasing 7:1a1e6f72ec38 "G" |
|
162 | 162 | rebasing 8:904590360559 "H" |
|
163 | 163 | rebasing 9:59c2e59309fe "dev-two named branch" |
|
164 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080- |
|
|
164 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg (glob) | |
|
165 | 165 | |
|
166 | 166 | $ hg tglog |
|
167 | 167 | o 9: 'dev-two named branch' dev-two |
@@ -190,7 +190,7 b' Branch name containing a dash (issue3181' | |||
|
190 | 190 | rebasing 7:549f007a9f5f "G" |
|
191 | 191 | rebasing 8:12b2bc666e20 "H" |
|
192 | 192 | rebasing 9:71325f8bc082 "dev-two named branch" (tip) |
|
193 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52- |
|
|
193 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg (glob) | |
|
194 | 194 | |
|
195 | 195 | $ hg tglog |
|
196 | 196 | o 9: 'dev-two named branch' dev-two |
@@ -221,7 +221,7 b' Rebasing descendant onto ancestor across' | |||
|
221 | 221 | rebasing 1:42ccdea3bb16 "B" |
|
222 | 222 | rebasing 2:5fddd98957c8 "C" |
|
223 | 223 | rebasing 3:32af7686d403 "D" |
|
224 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3- |
|
|
224 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) | |
|
225 | 225 | |
|
226 | 226 | $ hg tglog |
|
227 | 227 | o 9: 'D' |
@@ -253,7 +253,7 b' Rebasing descendant onto ancestor across' | |||
|
253 | 253 | rebasing 7:3bdb949809d9 "B" |
|
254 | 254 | rebasing 8:a0d543090fa4 "C" |
|
255 | 255 | rebasing 9:e9f862ce8bad "D" (tip) |
|
256 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74- |
|
|
256 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg (glob) | |
|
257 | 257 | |
|
258 | 258 | $ hg tglog |
|
259 | 259 | o 9: 'D' |
@@ -290,7 +290,7 b' Reopen branch by rebase' | |||
|
290 | 290 | rebasing 7:160b0930ccc6 "B" |
|
291 | 291 | rebasing 8:810110211f50 "C" |
|
292 | 292 | rebasing 9:e522577ccdbd "D" |
|
293 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/8e279d293175-b023e27c- |
|
|
293 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/8e279d293175-b023e27c-rebase.hg (glob) | |
|
294 | 294 | |
|
295 | 295 | $ cd .. |
|
296 | 296 | |
@@ -329,7 +329,7 b" rebase 'b2' to another lower branch head" | |||
|
329 | 329 | $ hg rebase |
|
330 | 330 | rebasing 2:792845bb77ee "b2" |
|
331 | 331 | note: rebase of 2:792845bb77ee created no changes to commit |
|
332 |
saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee- |
|
|
332 | saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg (glob) | |
|
333 | 333 | $ hg tglog |
|
334 | 334 | o 2: 'c1' c |
|
335 | 335 | | |
@@ -344,7 +344,7 b" rebase 'b1' on top of the tip of the bra" | |||
|
344 | 344 | $ hg up -qr 1 |
|
345 | 345 | $ hg rebase |
|
346 | 346 | rebasing 1:40039acb7ca5 "b1" |
|
347 |
saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1- |
|
|
347 | saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-rebase.hg (glob) | |
|
348 | 348 | $ hg tglog |
|
349 | 349 | @ 3: 'b1' b |
|
350 | 350 | | |
@@ -395,7 +395,7 b" rebase 'c1' to the branch head 'c2' that" | |||
|
395 | 395 | rebasing 3:76abc1c6f8c7 "b1" |
|
396 | 396 | rebasing 4:8427af5d86f2 "c2 closed" (tip) |
|
397 | 397 | note: rebase of 4:8427af5d86f2 created no changes to commit |
|
398 |
saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13- |
|
|
398 | saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg (glob) | |
|
399 | 399 | $ hg tglog |
|
400 | 400 | o 3: 'b1' x |
|
401 | 401 | | |
@@ -44,7 +44,7 b'' | |||
|
44 | 44 | merging a |
|
45 | 45 | rebasing 2:30ae917c0e4f "C" |
|
46 | 46 | merging a |
|
47 |
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163- |
|
|
47 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-rebase.hg (glob) | |
|
48 | 48 | |
|
49 | 49 | $ hg tglog |
|
50 | 50 | o 3: 'C' |
@@ -138,7 +138,7 b' Full rebase all the way back from branch' | |||
|
138 | 138 | other [source] changed f-default which local [dest] deleted |
|
139 | 139 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
|
140 | 140 | rebasing 6:9455ee510502 "dev: merge default" |
|
141 |
saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b- |
|
|
141 | saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg (glob) | |
|
142 | 142 | $ hg tglog |
|
143 | 143 | o 6: 'dev: merge default' |
|
144 | 144 | | |
@@ -167,7 +167,7 b' Grafty cherry picking rebasing:' | |||
|
167 | 167 | other [source] changed f-default which local [dest] deleted |
|
168 | 168 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
|
169 | 169 | rebasing 6:9455ee510502 "dev: merge default" |
|
170 |
saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222- |
|
|
170 | saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg (glob) | |
|
171 | 171 | $ hg tglog |
|
172 | 172 | o 7: 'dev: merge default' |
|
173 | 173 | | |
@@ -239,7 +239,7 b' Test order of parents of rebased merged ' | |||
|
239 | 239 | |
|
240 | 240 | $ hg rebase -r 4 -d 2 |
|
241 | 241 | rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor" |
|
242 |
saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3- |
|
|
242 | saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3-rebase.hg (glob) | |
|
243 | 243 | $ hg tip |
|
244 | 244 | changeset: 5:cca50676b1c5 |
|
245 | 245 | tag: tip |
@@ -251,7 +251,7 b' Test order of parents of rebased merged ' | |||
|
251 | 251 | |
|
252 | 252 | $ hg rebase -r 4 -d 2 |
|
253 | 253 | rebasing 4:a57575f79074 "merge p1 1=ancestor p2 3=outside" |
|
254 |
saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-385426e5- |
|
|
254 | saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-385426e5-rebase.hg (glob) | |
|
255 | 255 | $ hg tip |
|
256 | 256 | changeset: 5:f9daf77ffe76 |
|
257 | 257 | tag: tip |
@@ -307,7 +307,7 b' rebase of merge of ancestors' | |||
|
307 | 307 | 199 (changelog) |
|
308 | 308 | 216 (manifests) |
|
309 | 309 | 182 other |
|
310 |
saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-f46990e5- |
|
|
310 | saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-f46990e5-rebase.hg (glob) | |
|
311 | 311 | 1 changesets found |
|
312 | 312 | uncompressed size of bundle content: |
|
313 | 313 | 254 (changelog) |
@@ -974,9 +974,12 b' during the rebase operation' | |||
|
974 | 974 | $ hg log -r . |
|
975 | 975 | 3:be1832deae9a b (no-eol) |
|
976 | 976 | |
|
977 |
Check that bookmark was moved to rev 3 |
|
|
978 | during the rebase operation | |
|
977 | Check that bookmark was not moved to rev 3 if rev 2 was skipped during the | |
|
978 | rebase operation. This makes sense because if rev 2 has a successor, the | |
|
979 | operation generating that successor (ex. rebase) should be responsible for | |
|
980 | moving bookmarks. If the bookmark is on a precursor, like rev 2, that means the | |
|
981 | user manually moved it back. In that case we should not move it again. | |
|
979 | 982 | $ hg bookmarks |
|
980 |
mybook |
|
|
983 | mybook 2:1e9a3c00cbe9 | |
|
981 | 984 | $ hg debugobsolete --rev tip |
|
982 | 985 | 1e9a3c00cbe90d236ac05ef61efcc5e40b7412bc be1832deae9ac531caa7438b8dcf6055a122cd8e 0 (*) {'user': 'test'} (glob) |
@@ -134,7 +134,7 b' Rebase with no arguments (from 3 onto 8)' | |||
|
134 | 134 | rebasing 1:42ccdea3bb16 "B" |
|
135 | 135 | rebasing 2:5fddd98957c8 "C" |
|
136 | 136 | rebasing 3:32af7686d403 "D" |
|
137 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3- |
|
|
137 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) | |
|
138 | 138 | |
|
139 | 139 | $ hg tglog |
|
140 | 140 | @ 6: 'D' |
@@ -168,7 +168,7 b" Rebase with base == '.' => same as no ar" | |||
|
168 | 168 | rebasing 1:42ccdea3bb16 "B" |
|
169 | 169 | rebasing 2:5fddd98957c8 "C" |
|
170 | 170 | rebasing 3:32af7686d403 "D" |
|
171 |
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3- |
|
|
171 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) | |
|
172 | 172 | |
|
173 | 173 | $ hg tglog |
|
174 | 174 | @ 6: 'D' |
@@ -197,7 +197,7 b' Rebase with dest == branch(.) => same as' | |||
|
197 | 197 | rebasing 1:42ccdea3bb16 "B" |
|
198 | 198 | rebasing 2:5fddd98957c8 "C" |
|
199 | 199 | rebasing 3:32af7686d403 "D" |
|
200 |
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3- |
|
|
200 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) | |
|
201 | 201 | |
|
202 | 202 | $ hg tglog |
|
203 | 203 | @ 8: 'D' |
@@ -229,7 +229,7 b' Specify only source (from 2 onto 8):' | |||
|
229 | 229 | $ hg rebase --source 'desc("C")' |
|
230 | 230 | rebasing 2:5fddd98957c8 "C" |
|
231 | 231 | rebasing 3:32af7686d403 "D" |
|
232 |
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1- |
|
|
232 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) | |
|
233 | 233 | |
|
234 | 234 | $ hg tglog |
|
235 | 235 | o 6: 'D' |
@@ -258,7 +258,7 b' Specify only dest (from 3 onto 6):' | |||
|
258 | 258 | rebasing 1:42ccdea3bb16 "B" |
|
259 | 259 | rebasing 2:5fddd98957c8 "C" |
|
260 | 260 | rebasing 3:32af7686d403 "D" |
|
261 |
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3- |
|
|
261 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) | |
|
262 | 262 | |
|
263 | 263 | $ hg tglog |
|
264 | 264 | @ 8: 'D' |
@@ -291,7 +291,7 b' Specify only base (from 1 onto 8):' | |||
|
291 | 291 | rebasing 1:42ccdea3bb16 "B" |
|
292 | 292 | rebasing 2:5fddd98957c8 "C" |
|
293 | 293 | rebasing 3:32af7686d403 "D" |
|
294 |
saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3- |
|
|
294 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) | |
|
295 | 295 | |
|
296 | 296 | $ hg tglog |
|
297 | 297 | o 6: 'D' |
@@ -319,7 +319,7 b' Specify source and dest (from 2 onto 7):' | |||
|
319 | 319 | $ hg rebase --source 2 --dest 7 |
|
320 | 320 | rebasing 2:5fddd98957c8 "C" |
|
321 | 321 | rebasing 3:32af7686d403 "D" |
|
322 |
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1- |
|
|
322 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) | |
|
323 | 323 | |
|
324 | 324 | $ hg tglog |
|
325 | 325 | o 8: 'D' |
@@ -352,7 +352,7 b' Specify base and dest (from 1 onto 7):' | |||
|
352 | 352 | rebasing 1:42ccdea3bb16 "B" |
|
353 | 353 | rebasing 2:5fddd98957c8 "C" |
|
354 | 354 | rebasing 3:32af7686d403 "D" |
|
355 |
saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3- |
|
|
355 | saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) | |
|
356 | 356 | |
|
357 | 357 | $ hg tglog |
|
358 | 358 | o 8: 'D' |
@@ -384,7 +384,7 b' Specify only revs (from 2 onto 8)' | |||
|
384 | 384 | $ hg rebase --rev 'desc("C")::' |
|
385 | 385 | rebasing 2:5fddd98957c8 "C" |
|
386 | 386 | rebasing 3:32af7686d403 "D" |
|
387 |
saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1- |
|
|
387 | saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) | |
|
388 | 388 | |
|
389 | 389 | $ hg tglog |
|
390 | 390 | o 6: 'D' |
@@ -410,7 +410,7 b' Rebasing both a single revision and a me' | |||
|
410 | 410 | $ hg rebase -r 3 -r 6 --dest 8 |
|
411 | 411 | rebasing 3:32af7686d403 "D" |
|
412 | 412 | rebasing 6:eea13746799a "G" |
|
413 |
saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6- |
|
|
413 | saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-rebase.hg (glob) | |
|
414 | 414 | $ cd .. |
|
415 | 415 | |
|
416 | 416 | Test --tool parameter: |
@@ -440,7 +440,7 b' Test --tool parameter:' | |||
|
440 | 440 | $ hg rebase -s 2 -d 1 --tool internal:local |
|
441 | 441 | rebasing 2:e4e3f3546619 "c2b" (tip) |
|
442 | 442 | note: rebase of 2:e4e3f3546619 created no changes to commit |
|
443 |
saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178- |
|
|
443 | saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob) | |
|
444 | 444 | |
|
445 | 445 | $ hg cat c2 |
|
446 | 446 | c2 |
@@ -453,7 +453,7 b' Test --tool parameter:' | |||
|
453 | 453 | |
|
454 | 454 | $ hg rebase -s 2 -d 1 --tool internal:other |
|
455 | 455 | rebasing 2:e4e3f3546619 "c2b" (tip) |
|
456 |
saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178- |
|
|
456 | saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob) | |
|
457 | 457 | |
|
458 | 458 | $ hg cat c2 |
|
459 | 459 | c2b |
@@ -493,7 +493,7 b' Test --tool parameter:' | |||
|
493 | 493 | $ hg rebase -c --tool internal:fail |
|
494 | 494 | rebasing 2:e4e3f3546619 "c2b" (tip) |
|
495 | 495 | note: rebase of 2:e4e3f3546619 created no changes to commit |
|
496 |
saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178- |
|
|
496 | saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob) | |
|
497 | 497 | |
|
498 | 498 | $ hg rebase -i |
|
499 | 499 | abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit") |
@@ -55,7 +55,7 b' Now b has one revision to be pulled from' | |||
|
55 | 55 | adding file changes |
|
56 | 56 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
57 | 57 | rebasing 2:ff8d69a621f9 "L1" |
|
58 |
saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373- |
|
|
58 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) | |
|
59 | 59 | |
|
60 | 60 | $ hg tglog |
|
61 | 61 | @ 3: 'L1' |
@@ -211,7 +211,7 b' pull --rebase works when a specific revi' | |||
|
211 | 211 | adding file changes |
|
212 | 212 | added 2 changesets with 2 changes to 2 files |
|
213 | 213 | rebasing 3:ff8d69a621f9 "L1" |
|
214 |
saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373- |
|
|
214 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) | |
|
215 | 215 | $ hg tglog |
|
216 | 216 | @ 5: 'L1' |
|
217 | 217 | | |
@@ -253,7 +253,7 b' pull --rebase works with bundle2 turned ' | |||
|
253 | 253 | adding file changes |
|
254 | 254 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
255 | 255 | rebasing 5:518d153c0ba3 "L1" |
|
256 |
saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14- |
|
|
256 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg (glob) | |
|
257 | 257 | $ hg tglog |
|
258 | 258 | @ 6: 'L1' |
|
259 | 259 | | |
@@ -306,7 +306,7 b' pull --rebase only update if there is no' | |||
|
306 | 306 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
307 | 307 | rebasing 6:0d0727eb7ce0 "L1" |
|
308 | 308 | rebasing 7:c1f58876e3bf "L2" |
|
309 |
saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2- |
|
|
309 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg (glob) | |
|
310 | 310 | $ hg tglog |
|
311 | 311 | o 8: 'L2' |
|
312 | 312 | | |
@@ -422,7 +422,7 b' The second local head should not confuse' | |||
|
422 | 422 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
423 | 423 | rebasing 7:864e0a2d2614 "L1" |
|
424 | 424 | rebasing 8:6dc0ea5dcf55 "L2" |
|
425 |
saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c- |
|
|
425 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg (glob) | |
|
426 | 426 | $ hg tglog |
|
427 | 427 | @ 12: 'L2' |
|
428 | 428 | | |
@@ -61,7 +61,7 b' Rebase the revision containing the renam' | |||
|
61 | 61 | |
|
62 | 62 | $ hg rebase -s 3 -d 2 |
|
63 | 63 | rebasing 3:73a3ee40125d "rename A" (tip) |
|
64 |
saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf- |
|
|
64 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg (glob) | |
|
65 | 65 | |
|
66 | 66 | $ hg tglog |
|
67 | 67 | @ 3: 'rename A' |
@@ -152,7 +152,7 b' Rebase the revision containing the copy:' | |||
|
152 | 152 | |
|
153 | 153 | $ hg rebase -s 3 -d 2 |
|
154 | 154 | rebasing 3:0a8162ff18a8 "copy A" (tip) |
|
155 |
saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a- |
|
|
155 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg (glob) | |
|
156 | 156 | |
|
157 | 157 | $ hg tglog |
|
158 | 158 | @ 3: 'copy A' |
@@ -236,7 +236,7 b' Test rebase across repeating renames:' | |||
|
236 | 236 | |
|
237 | 237 | $ hg rebase -s 4 -d 3 |
|
238 | 238 | rebasing 4:b918d683b091 "Another unrelated change" (tip) |
|
239 |
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57- |
|
|
239 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg (glob) | |
|
240 | 240 | |
|
241 | 241 | $ hg diff --stat -c . |
|
242 | 242 | unrelated.txt | 1 + |
@@ -287,7 +287,7 b' Rebase the copies on top of the unrelate' | |||
|
287 | 287 | rebasing 1:79d255d24ad2 "File b created as copy of a and modified" |
|
288 | 288 | rebasing 2:327f772bc074 "File c created as copy of b and modified" |
|
289 | 289 | rebasing 3:421b7e82bb85 "File d created as copy of c and modified" |
|
290 |
saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a2265555- |
|
|
290 | saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a2265555-rebase.hg (glob) | |
|
291 | 291 | $ hg update 4 |
|
292 | 292 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
293 | 293 | |
@@ -314,7 +314,7 b' copy records collapse correctly.' | |||
|
314 | 314 | merging b and c to c |
|
315 | 315 | rebasing 4:dbb9ba033561 "File d created as copy of c and modified" |
|
316 | 316 | merging c and d to d |
|
317 |
saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-dde37595- |
|
|
317 | saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-dde37595-rebase.hg (glob) | |
|
318 | 318 | $ hg co tip |
|
319 | 319 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
320 | 320 |
@@ -65,7 +65,7 b' can abort or warn for colliding untracke' | |||
|
65 | 65 | HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com> |
|
66 | 66 | HG: branch 'default' |
|
67 | 67 | HG: added D |
|
68 |
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface- |
|
|
68 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob) | |
|
69 | 69 | $ cat D.orig |
|
70 | 70 | collide |
|
71 | 71 | $ rm D.orig |
@@ -100,7 +100,7 b' that we can ignore for colliding untrack' | |||
|
100 | 100 | |
|
101 | 101 | $ HGEDITOR=cat hg rebase -s 3 -d 5 --config merge.checkunknown=ignore |
|
102 | 102 | rebasing 3:32af7686d403 "D" |
|
103 |
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface- |
|
|
103 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob) | |
|
104 | 104 | $ cat D.orig |
|
105 | 105 | collide |
|
106 | 106 | $ rm D.orig |
@@ -138,7 +138,7 b' if they have the same contents)' | |||
|
138 | 138 | rebasing 4:9520eea781bc "E" |
|
139 | 139 | rebasing 6:eea13746799a "G" |
|
140 | 140 | note: rebase of 6:eea13746799a created no changes to commit |
|
141 |
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4- |
|
|
141 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob) | |
|
142 | 142 | $ f E.orig |
|
143 | 143 | E.orig: file not found |
|
144 | 144 | |
@@ -170,7 +170,7 b' F onto E - rebase of a branching point (' | |||
|
170 | 170 | rebasing 6:eea13746799a "G" |
|
171 | 171 | note: rebase of 6:eea13746799a created no changes to commit |
|
172 | 172 | rebasing 7:02de42196ebe "H" (tip) |
|
173 |
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d- |
|
|
173 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob) | |
|
174 | 174 | |
|
175 | 175 | $ hg tglog |
|
176 | 176 | @ 6: 'H' |
@@ -197,7 +197,7 b' G onto H - merged revision having a pare' | |||
|
197 | 197 | |
|
198 | 198 | $ hg rebase -s 6 -d 7 |
|
199 | 199 | rebasing 6:eea13746799a "G" |
|
200 |
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed- |
|
|
200 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-rebase.hg (glob) | |
|
201 | 201 | |
|
202 | 202 | $ hg tglog |
|
203 | 203 | o 7: 'G' |
@@ -228,7 +228,7 b' F onto B - G maintains E as parent:' | |||
|
228 | 228 | rebasing 5:24b6387c8c8c "F" |
|
229 | 229 | rebasing 6:eea13746799a "G" |
|
230 | 230 | rebasing 7:02de42196ebe "H" (tip) |
|
231 |
saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d- |
|
|
231 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob) | |
|
232 | 232 | |
|
233 | 233 | $ hg tglog |
|
234 | 234 | @ 7: 'H' |
@@ -301,7 +301,7 b' C onto A - rebase onto an ancestor:' | |||
|
301 | 301 | $ hg rebase -d 0 -s 2 |
|
302 | 302 | rebasing 2:5fddd98957c8 "C" |
|
303 | 303 | rebasing 3:32af7686d403 "D" |
|
304 |
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1- |
|
|
304 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) | |
|
305 | 305 | $ hg tglog |
|
306 | 306 | o 7: 'D' |
|
307 | 307 | | |
@@ -345,31 +345,31 b' Source phase greater or equal to destina' | |||
|
345 | 345 | 5 |
|
346 | 346 | $ hg rebase -s9 -d0 |
|
347 | 347 | rebasing 9:2b23e52411f4 "D" (tip) |
|
348 |
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf- |
|
|
348 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-rebase.hg (glob) | |
|
349 | 349 | $ hg id -n # check we updated back to parent |
|
350 | 350 | 5 |
|
351 | 351 | $ hg log --template "{phase}\n" -r 9 |
|
352 | 352 | draft |
|
353 | 353 | $ hg rebase -s9 -d1 |
|
354 | 354 | rebasing 9:2cb10d0cfc6c "D" (tip) |
|
355 |
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256- |
|
|
355 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-rebase.hg (glob) | |
|
356 | 356 | $ hg log --template "{phase}\n" -r 9 |
|
357 | 357 | draft |
|
358 | 358 | $ hg phase --force --secret 9 |
|
359 | 359 | $ hg rebase -s9 -d0 |
|
360 | 360 | rebasing 9:c5b12b67163a "D" (tip) |
|
361 |
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053- |
|
|
361 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-rebase.hg (glob) | |
|
362 | 362 | $ hg log --template "{phase}\n" -r 9 |
|
363 | 363 | secret |
|
364 | 364 | $ hg rebase -s9 -d1 |
|
365 | 365 | rebasing 9:2a0524f868ac "D" (tip) |
|
366 |
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574- |
|
|
366 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-rebase.hg (glob) | |
|
367 | 367 | $ hg log --template "{phase}\n" -r 9 |
|
368 | 368 | secret |
|
369 | 369 | Source phase lower than destination phase: new changeset get the phase of destination: |
|
370 | 370 | $ hg rebase -s8 -d9 |
|
371 | 371 | rebasing 8:6d4f22462821 "C" |
|
372 |
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b- |
|
|
372 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-rebase.hg (glob) | |
|
373 | 373 | $ hg log --template "{phase}\n" -r 'rev(9)' |
|
374 | 374 | secret |
|
375 | 375 | |
@@ -597,7 +597,7 b' rebase on ancestor with revset' | |||
|
597 | 597 | rebasing 6:3d8a618087a7 "G" |
|
598 | 598 | rebasing 7:72434a4e60b0 "H" |
|
599 | 599 | rebasing 8:479ddb54a924 "I" (tip) |
|
600 |
saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31- |
|
|
600 | saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg (glob) | |
|
601 | 601 | $ hg tglog |
|
602 | 602 | o 8: 'I' |
|
603 | 603 | | |
@@ -632,7 +632,7 b' We would expect heads are I, F if it was' | |||
|
632 | 632 | rebasing 6:3d8a618087a7 "G" |
|
633 | 633 | rebasing 7:72434a4e60b0 "H" |
|
634 | 634 | rebasing 8:479ddb54a924 "I" (tip) |
|
635 |
saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24- |
|
|
635 | saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg (glob) | |
|
636 | 636 | $ hg tglog |
|
637 | 637 | o 8: 'I' |
|
638 | 638 | | |
@@ -701,7 +701,7 b' each root have a different common ancest' | |||
|
701 | 701 | $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)' |
|
702 | 702 | rebasing 8:e7ec4e813ba6 "I" |
|
703 | 703 | rebasing 10:23a4ace37988 "K" (tip) |
|
704 |
saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3- |
|
|
704 | saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg (glob) | |
|
705 | 705 | $ hg log --rev 'children(desc(G))' |
|
706 | 706 | changeset: 9:adb617877056 |
|
707 | 707 | parent: 6:eea13746799a |
@@ -768,7 +768,7 b' Test that rebase is not confused by $CWD' | |||
|
768 | 768 | current directory was removed |
|
769 | 769 | (consider changing to repo root: $TESTTMP/cwd-vanish) |
|
770 | 770 | rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) |
|
771 |
saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073- |
|
|
771 | saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg (glob) | |
|
772 | 772 | #else |
|
773 | 773 | $ hg rebase -b . -d 1 --traceback |
|
774 | 774 | rebasing 2:779a07b1b7a0 "first source commit" |
@@ -825,7 +825,7 b' Test that rebase is done in topo order (' | |||
|
825 | 825 | rebasing 4:82ae8dc7a9b7 "E" |
|
826 | 826 | rebasing 3:ab709c9f7171 "D" |
|
827 | 827 | rebasing 5:412b391de760 "F" |
|
828 |
saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99- |
|
|
828 | saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-rebase.hg (glob) | |
|
829 | 829 | |
|
830 | 830 | $ hg tglog |
|
831 | 831 | o 6: 'F' |
@@ -626,7 +626,7 b' shelve should leave dirstate clean (issu' | |||
|
626 | 626 | $ hg rebase -d 1 --config extensions.rebase= |
|
627 | 627 | rebasing 2:323bfa07f744 "xyz" (tip) |
|
628 | 628 | merging x |
|
629 |
saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325- |
|
|
629 | saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg (glob) | |
|
630 | 630 | $ hg unshelve |
|
631 | 631 | unshelving change 'default' |
|
632 | 632 | rebasing shelved changes |
@@ -223,7 +223,7 b' Verify rebase succeeds if all changed fi' | |||
|
223 | 223 | $ hg commit -Aqm "add show2" |
|
224 | 224 | $ hg rebase -d 1 --config extensions.rebase= |
|
225 | 225 | rebasing 2:bdde55290160 "add show2" (tip) |
|
226 |
saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/bdde55290160-216ed9c6- |
|
|
226 | saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/bdde55290160-216ed9c6-rebase.hg (glob) | |
|
227 | 227 | |
|
228 | 228 | Verify log --sparse only shows commits that affect the sparse checkout |
|
229 | 229 |
General Comments 0
You need to be logged in to leave comments.
Login now