Show More
@@ -146,13 +146,8 b' def _revsetdestautoorphanrebase(repo, su' | |||
|
146 | 146 | |
|
147 | 147 | def _ctxdesc(ctx): |
|
148 | 148 | """short description for a context""" |
|
149 | labels_spec = b'join(filter(namespaces % "{ifeq(namespace, "branches", "", join(names, " "))}"), " ")' | |
|
150 | spec = b'{rev}:{node|short} "{desc|firstline}"{if(%s, " ({%s})")}' % ( | |
|
151 | labels_spec, | |
|
152 | labels_spec, | |
|
153 | ) | |
|
154 | 149 | return cmdutil.format_changeset_summary( |
|
155 |
ctx.repo().ui, ctx, command=b'rebase' |
|
|
150 | ctx.repo().ui, ctx, command=b'rebase' | |
|
156 | 151 | ) |
|
157 | 152 | |
|
158 | 153 |
@@ -1222,8 +1222,16 b' def format_changeset_summary(ui, ctx, co' | |||
|
1222 | 1222 | if not spec: |
|
1223 | 1223 | spec = default_spec |
|
1224 | 1224 | if not spec: |
|
1225 | # TODO: Pick a default we can agree on. This isn't used yet. | |
|
1226 | raise error.ProgrammingError(b"no default one-line summary defined yet") | |
|
1225 | spec = ( | |
|
1226 | b'{separate(" ", ' | |
|
1227 | b'label("log.changeset", "{rev}:{node|short}")' | |
|
1228 | b', ' | |
|
1229 | b'label("log.tag", tags)' | |
|
1230 | b', ' | |
|
1231 | b'label("log.bookmark", bookmarks)' | |
|
1232 | b')} ' | |
|
1233 | b'"{label("log.desc", desc|firstline)}"' | |
|
1234 | ) | |
|
1227 | 1235 | text = rendertemplate(ctx, spec) |
|
1228 | 1236 | return text.split(b'\n')[0] |
|
1229 | 1237 |
@@ -17,7 +17,7 b' Abort absorb if there is an unfinished o' | |||
|
17 | 17 | $ hg commit -Aqm "foo 2" |
|
18 | 18 | |
|
19 | 19 | $ hg --config extensions.rebase= rebase -r 1 -d 0 |
|
20 |
rebasing 1:c3b6dc0e177a "foo 2" |
|
|
20 | rebasing 1:c3b6dc0e177a tip "foo 2" | |
|
21 | 21 | merging foo.whole |
|
22 | 22 | warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') |
|
23 | 23 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -177,7 +177,7 b' and the rebase should fail (issue5628)' | |||
|
177 | 177 | |
|
178 | 178 | $ hg up -qC 2 |
|
179 | 179 | $ hg rebase -s 2 -d 1 --config extensions.rebase= |
|
180 |
rebasing 2:e73c21d6b244 "file a/poisoned" |
|
|
180 | rebasing 2:e73c21d6b244 tip "file a/poisoned" | |
|
181 | 181 | abort: path 'a/poisoned' traverses symbolic link 'a' |
|
182 | 182 | [255] |
|
183 | 183 | $ ls ../merge-symlink-out |
@@ -37,7 +37,7 b' bookmark list' | |||
|
37 | 37 | rebase |
|
38 | 38 | |
|
39 | 39 | $ hg rebase -s two -d one |
|
40 |
rebasing 3:2ae46b1d99a7 "3" |
|
|
40 | rebasing 3:2ae46b1d99a7 tip two "3" | |
|
41 | 41 | saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg |
|
42 | 42 | |
|
43 | 43 | $ hg log |
@@ -77,7 +77,7 b' aborted rebase should restore active boo' | |||
|
77 | 77 | created new head |
|
78 | 78 | $ hg bookmark three |
|
79 | 79 | $ hg rebase -s three -d two |
|
80 |
rebasing 4:dd7c838e8362 "4" |
|
|
80 | rebasing 4:dd7c838e8362 tip three "4" | |
|
81 | 81 | merging d |
|
82 | 82 | warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
|
83 | 83 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -92,7 +92,7 b' aborted rebase should restore active boo' | |||
|
92 | 92 | after aborted rebase, restoring a bookmark that has been removed should not fail |
|
93 | 93 | |
|
94 | 94 | $ hg rebase -s three -d two |
|
95 |
rebasing 4:dd7c838e8362 "4" |
|
|
95 | rebasing 4:dd7c838e8362 tip three "4" | |
|
96 | 96 | merging d |
|
97 | 97 | warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
|
98 | 98 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -344,7 +344,7 b' Test rebasing a commit with copy informa' | |||
|
344 | 344 | $ hg mv a b |
|
345 | 345 | $ hg ci -qm 'rename a to b' |
|
346 | 346 | $ hg rebase -d 1 --config rebase.experimental.inmemory=yes |
|
347 |
rebasing 2:* "rename a to b" |
|
|
347 | rebasing 2:* tip "rename a to b" (glob) | |
|
348 | 348 | merging a and b to b |
|
349 | 349 | saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/*-*-rebase.hg (glob) |
|
350 | 350 | $ hg st --change . --copies |
@@ -625,8 +625,8 b' merging csets is a descendant of the bas' | |||
|
625 | 625 | a |
|
626 | 626 | |
|
627 | 627 | $ hg rebase -r . -d 2 -t :other |
|
628 |
rebasing 5:5018b1509e94 "added willconflict and d" |
|
|
629 |
rebasing 5:af8d273bf580 "added willconflict and d" |
|
|
628 | rebasing 5:5018b1509e94 tip "added willconflict and d" (no-changeset !) | |
|
629 | rebasing 5:af8d273bf580 tip "added willconflict and d" (changeset !) | |
|
630 | 630 | |
|
631 | 631 | $ hg up 3 -q |
|
632 | 632 |
$ |
@@ -137,7 +137,7 b' first verify copy metadata was kept' | |||
|
137 | 137 | |
|
138 | 138 | $ hg up -qC 2 |
|
139 | 139 | $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= |
|
140 |
rebasing 2:add3f11052fa "other" |
|
|
140 | rebasing 2:add3f11052fa tip "other" | |
|
141 | 141 | merging b and a to b |
|
142 | 142 | merging c and a to c |
|
143 | 143 | |
@@ -156,7 +156,7 b' first verify copy metadata was kept' | |||
|
156 | 156 | $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF |
|
157 | 157 | > c |
|
158 | 158 | > EOF |
|
159 |
rebasing 2:add3f11052fa "other" |
|
|
159 | rebasing 2:add3f11052fa tip "other" | |
|
160 | 160 | file 'a' was deleted in local [dest] but was modified in other [source]. |
|
161 | 161 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
|
162 | 162 | What do you want to do? c |
@@ -238,7 +238,7 b' A file is copied on one side and has bee' | |||
|
238 | 238 | file is copied from `0:a`, so the file history of the `3:b` should trace directly to `0:a`. |
|
239 | 239 | |
|
240 | 240 | $ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.copytrace=off |
|
241 |
rebasing 3:47e1a9e6273b "copy a->b (2)" |
|
|
241 | rebasing 3:47e1a9e6273b tip "copy a->b (2)" | |
|
242 | 242 | saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg |
|
243 | 243 | |
|
244 | 244 | $ hg log -G -f b |
@@ -54,7 +54,7 b' Check filename heuristics (same dirname ' | |||
|
54 | 54 | desc: initial |
|
55 | 55 | |
|
56 | 56 | $ hg rebase -s . -d 1 |
|
57 |
rebasing 2:557f403c0afd "mod a, mod dir/file.txt" |
|
|
57 | rebasing 2:557f403c0afd tip "mod a, mod dir/file.txt" | |
|
58 | 58 | merging b and a to b |
|
59 | 59 | merging dir2/file.txt and dir/file.txt to dir2/file.txt |
|
60 | 60 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-rebase.hg |
@@ -87,7 +87,7 b' Make sure filename heuristics do not whe' | |||
|
87 | 87 | desc: initial |
|
88 | 88 | |
|
89 | 89 | $ hg rebase -s . -d 1 |
|
90 |
rebasing 2:d526312210b9 "mode a" |
|
|
90 | rebasing 2:d526312210b9 tip "mode a" | |
|
91 | 91 | file 'a' was deleted in local [dest] but was modified in other [source]. |
|
92 | 92 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
|
93 | 93 | What do you want to do? u |
@@ -126,7 +126,7 b" Test when lca didn't modified the file t" | |||
|
126 | 126 | desc: initial |
|
127 | 127 | |
|
128 | 128 | $ hg rebase -s . -d 2 |
|
129 |
rebasing 3:9d5cf99c3d9f "mod a" |
|
|
129 | rebasing 3:9d5cf99c3d9f tip "mod a" | |
|
130 | 130 | merging b and a to b |
|
131 | 131 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg |
|
132 | 132 | $ cd .. |
@@ -161,7 +161,7 b' Rebase "backwards"' | |||
|
161 | 161 | desc: initial |
|
162 | 162 | |
|
163 | 163 | $ hg rebase -s . -d 0 |
|
164 |
rebasing 3:fbe97126b396 "mod b" |
|
|
164 | rebasing 3:fbe97126b396 tip "mod b" | |
|
165 | 165 | merging a and b to a |
|
166 | 166 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg |
|
167 | 167 | $ cd .. |
@@ -198,7 +198,7 b' Check a few potential move candidates' | |||
|
198 | 198 | desc: initial |
|
199 | 199 | |
|
200 | 200 | $ hg rebase -s . -d 2 |
|
201 |
rebasing 3:6b2f4cece40f "mod dir/a" |
|
|
201 | rebasing 3:6b2f4cece40f tip "mod dir/a" | |
|
202 | 202 | merging dir/b and dir/a to dir/b |
|
203 | 203 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg |
|
204 | 204 | $ cd .. |
@@ -243,7 +243,7 b' Test the copytrace.movecandidateslimit w' | |||
|
243 | 243 | With small limit |
|
244 | 244 | |
|
245 | 245 | $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 |
|
246 |
rebasing 2:ef716627c70b "mod a" |
|
|
246 | rebasing 2:ef716627c70b tip "mod a" | |
|
247 | 247 | skipping copytracing for 'a', more candidates than the limit: 7 |
|
248 | 248 | file 'a' was deleted in local [dest] but was modified in other [source]. |
|
249 | 249 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
@@ -257,7 +257,7 b' With small limit' | |||
|
257 | 257 | With default limit which is 100 |
|
258 | 258 | |
|
259 | 259 | $ hg rebase -s 2 -d 1 |
|
260 |
rebasing 2:ef716627c70b "mod a" |
|
|
260 | rebasing 2:ef716627c70b tip "mod a" | |
|
261 | 261 | merging foo and a to foo |
|
262 | 262 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg |
|
263 | 263 | |
@@ -323,7 +323,7 b' Move a directory in draft branch' | |||
|
323 | 323 | desc: initial |
|
324 | 324 | |
|
325 | 325 | $ hg rebase -s . -d 1 |
|
326 |
rebasing 2:a33d80b6e352 "mv dir/ dir2/" |
|
|
326 | rebasing 2:a33d80b6e352 tip "mv dir/ dir2/" | |
|
327 | 327 | merging dir/a and dir2/a to dir2/a |
|
328 | 328 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg |
|
329 | 329 | $ cd .. |
@@ -358,7 +358,7 b' Move file twice and rebase mod on top of' | |||
|
358 | 358 | o rev: 0 |
|
359 | 359 | desc: initial |
|
360 | 360 | $ hg rebase -s . -d 2 |
|
361 |
rebasing 3:d41316942216 "mod a" |
|
|
361 | rebasing 3:d41316942216 tip "mod a" | |
|
362 | 362 | merging c and a to c |
|
363 | 363 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg |
|
364 | 364 | |
@@ -431,7 +431,7 b' Move one file and add another file in th' | |||
|
431 | 431 | desc: initial |
|
432 | 432 | |
|
433 | 433 | $ hg rebase -s . -d 2 |
|
434 |
rebasing 3:ef716627c70b "mod a" |
|
|
434 | rebasing 3:ef716627c70b tip "mod a" | |
|
435 | 435 | merging b and a to b |
|
436 | 436 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg |
|
437 | 437 | $ ls -A |
@@ -504,7 +504,7 b' Copy and move file' | |||
|
504 | 504 | desc: initial |
|
505 | 505 | |
|
506 | 506 | $ hg rebase -s . -d 1 |
|
507 |
rebasing 2:ef716627c70b "mod a" |
|
|
507 | rebasing 2:ef716627c70b tip "mod a" | |
|
508 | 508 | merging b and a to b |
|
509 | 509 | merging c and a to c |
|
510 | 510 | saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg |
@@ -631,7 +631,7 b' File directory and base name changed in ' | |||
|
631 | 631 | desc: initial |
|
632 | 632 | |
|
633 | 633 | $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 |
|
634 |
rebasing 2:6207d2d318e7 "mod a" |
|
|
634 | rebasing 2:6207d2d318e7 tip "mod a" | |
|
635 | 635 | merging dir2/b and dir1/a to dir2/b |
|
636 | 636 | saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg |
|
637 | 637 | $ cat dir2/b |
@@ -669,7 +669,7 b' in other merge parent. File moved on reb' | |||
|
669 | 669 | desc: initial |
|
670 | 670 | |
|
671 | 671 | $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 |
|
672 |
rebasing 2:e8919e7df8d0 "mv dir1 dir2" |
|
|
672 | rebasing 2:e8919e7df8d0 tip "mv dir1 dir2" | |
|
673 | 673 | saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg |
|
674 | 674 | $ ls dir2 |
|
675 | 675 | a |
@@ -225,7 +225,7 b' the merge tool goes to /dev/null because' | |||
|
225 | 225 | > EOF |
|
226 | 226 | |
|
227 | 227 | $ hg rebase -s . -d 3 --tool test |
|
228 |
rebasing 4:b08445fd6b2a "c4" |
|
|
228 | rebasing 4:b08445fd6b2a tip "c4" | |
|
229 | 229 | merging a |
|
230 | 230 | custom merge tool |
|
231 | 231 | custom merge tool end |
@@ -865,7 +865,7 b' fixing the working directory if there ar' | |||
|
865 | 865 | $ hg commit -Aqm "foo 2" |
|
866 | 866 | |
|
867 | 867 | $ hg --config extensions.rebase= rebase -r 1 -d 0 |
|
868 |
rebasing 1:c3b6dc0e177a "foo 2" |
|
|
868 | rebasing 1:c3b6dc0e177a tip "foo 2" | |
|
869 | 869 | merging foo.whole |
|
870 | 870 | warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') |
|
871 | 871 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -356,7 +356,7 b' enabling obsmarkers and rebase extension' | |||
|
356 | 356 | |
|
357 | 357 | $ hg phase -r . --draft --force |
|
358 | 358 | $ hg rebase -r 6 -d 3 |
|
359 |
rebasing 6:9b42578d4447 "added f" |
|
|
359 | rebasing 6:9b42578d4447 tip "added f" | |
|
360 | 360 | |
|
361 | 361 | $ hg glog |
|
362 | 362 | @ 7:99949238d9ac added f |
@@ -307,7 +307,7 b' automated commit like rebase/transplant' | |||
|
307 | 307 | |
|
308 | 308 | $ hg rebase -s 1 -d 2 --keep |
|
309 | 309 | rebasing 1:72518492caa6 "#1" |
|
310 |
rebasing 4:07d6153b5c04 "#4" |
|
|
310 | rebasing 4:07d6153b5c04 tip "#4" | |
|
311 | 311 | |
|
312 | 312 | $ hg status -A large1 |
|
313 | 313 | large1: $ENOENT$ |
@@ -70,5 +70,5 b' create full repo' | |||
|
70 | 70 | $ echo new > inside/f5 |
|
71 | 71 | $ hg ci -Aqm 'add inside/f5' |
|
72 | 72 | $ hg --config extensions.rebase= rebase -d 'public()' -r . |
|
73 |
rebasing 6:610b60178c28 "add inside/f5" |
|
|
73 | rebasing 6:610b60178c28 tip "add inside/f5" | |
|
74 | 74 | saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/610b60178c28-65716a78-rebase.hg |
@@ -61,7 +61,7 b' Can rebase onto commit where no files ou' | |||
|
61 | 61 | $ echo modified > inside/f2 |
|
62 | 62 | $ hg ci -qm 'modify inside/f2' |
|
63 | 63 | $ hg rebase -d 'desc("modify inside/f1")' |
|
64 |
rebasing 5:c2f36d04e05d "modify inside/f2" |
|
|
64 | rebasing 5:c2f36d04e05d tip "modify inside/f2" | |
|
65 | 65 | saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob) |
|
66 | 66 | |
|
67 | 67 | Can rebase onto conflicting changes inside narrow spec |
@@ -70,14 +70,14 b' Can rebase onto conflicting changes insi' | |||
|
70 | 70 | $ echo conflicting > inside/f1 |
|
71 | 71 | $ hg ci -qm 'conflicting inside/f1' |
|
72 | 72 | $ hg rebase -d 'desc("modify inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)' |
|
73 |
rebasing 6:cdce97fbf653 "conflicting inside/f1" |
|
|
73 | rebasing 6:cdce97fbf653 tip "conflicting inside/f1" | |
|
74 | 74 | merging inside/f1 |
|
75 | 75 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
|
76 | 76 | $ echo modified3 > inside/f1 |
|
77 | 77 | $ hg resolve -m 2>&1 | grep -v continue: |
|
78 | 78 | (no more unresolved files) |
|
79 | 79 | $ hg continue |
|
80 |
rebasing 6:cdce97fbf653 "conflicting inside/f1" |
|
|
80 | rebasing 6:cdce97fbf653 tip "conflicting inside/f1" | |
|
81 | 81 | saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob) |
|
82 | 82 | |
|
83 | 83 | Can rebase onto non-conflicting changes outside narrow spec |
@@ -86,7 +86,7 b' Can rebase onto non-conflicting changes ' | |||
|
86 | 86 | $ echo modified > inside/f2 |
|
87 | 87 | $ hg ci -qm 'modify inside/f2' |
|
88 | 88 | $ hg rebase -d 'desc("modify outside/f1")' |
|
89 |
rebasing 7:c2f36d04e05d "modify inside/f2" |
|
|
89 | rebasing 7:c2f36d04e05d tip "modify inside/f2" | |
|
90 | 90 | saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob) |
|
91 | 91 | |
|
92 | 92 | Rebase interrupts on conflicting changes outside narrow spec |
@@ -76,7 +76,7 b' rebase (parents change)' | |||
|
76 | 76 | $ mkcommit C0 |
|
77 | 77 | $ mkcommit D0 |
|
78 | 78 | $ hg rebase -r . -d 'desc(B0)' |
|
79 |
rebasing 10:c85eff83a034 "D0" |
|
|
79 | rebasing 10:c85eff83a034 tip "D0" | |
|
80 | 80 | |
|
81 | 81 | check result |
|
82 | 82 |
@@ -78,7 +78,7 b' Conflicting rebase:' | |||
|
78 | 78 | |
|
79 | 79 | $ hg rebase -s 3 -d 2 |
|
80 | 80 | rebasing 3:3163e20567cc "L1" |
|
81 |
rebasing 4:46f0b057b5c0 "L2" |
|
|
81 | rebasing 4:46f0b057b5c0 tip "L2" | |
|
82 | 82 | merging common |
|
83 | 83 | warning: conflicts while merging common! (edit, then use 'hg resolve --mark') |
|
84 | 84 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -145,7 +145,7 b' earlier than 2.7 by renaming ".hg/rebase' | |||
|
145 | 145 | |
|
146 | 146 | $ hg rebase -s 3 -d 2 |
|
147 | 147 | rebasing 3:3163e20567cc "L1" |
|
148 |
rebasing 4:46f0b057b5c0 "L2" |
|
|
148 | rebasing 4:46f0b057b5c0 tip "L2" | |
|
149 | 149 | merging common |
|
150 | 150 | warning: conflicts while merging common! (edit, then use 'hg resolve --mark') |
|
151 | 151 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -215,7 +215,7 b' Rebase and abort without generating new ' | |||
|
215 | 215 | $ hg rebase -b 4 -d 2 |
|
216 | 216 | rebasing 3:a6484957d6b9 "B bis" |
|
217 | 217 | note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes |
|
218 |
rebasing 4:145842775fec "C1" |
|
|
218 | rebasing 4:145842775fec tip "C1" | |
|
219 | 219 | merging c |
|
220 | 220 | warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
|
221 | 221 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -274,7 +274,7 b' rebase abort should not leave working co' | |||
|
274 | 274 | |
|
275 | 275 | |
|
276 | 276 | $ hg rebase -d master -r foo |
|
277 |
rebasing 3:6c0f977a22d8 "C" |
|
|
277 | rebasing 3:6c0f977a22d8 tip foo "C" | |
|
278 | 278 | merging c |
|
279 | 279 | warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
|
280 | 280 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -314,7 +314,7 b' user has somehow managed to update to a ' | |||
|
314 | 314 | created new head |
|
315 | 315 | |
|
316 | 316 | $ hg rebase -d @ -b foo --tool=internal:fail |
|
317 |
rebasing 2:070cf4580bb5 |
|
|
317 | rebasing 2:070cf4580bb5 tip foo "b2" | |
|
318 | 318 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
|
319 | 319 | [1] |
|
320 | 320 |
@@ -36,9 +36,9 b' Single branching point, without merge:' | |||
|
36 | 36 | > | |
|
37 | 37 | > R |
|
38 | 38 | > EOS |
|
39 |
rebasing 3:d6003a550c2c "C" |
|
|
40 |
rebasing 5:4526cf523425 "D" |
|
|
41 |
rebasing 6:b296604d9846 "E" |
|
|
39 | rebasing 3:d6003a550c2c C "C" | |
|
40 | rebasing 5:4526cf523425 D "D" | |
|
41 | rebasing 6:b296604d9846 E tip "E" | |
|
42 | 42 | o 6: 4870f5e7df37 E |
|
43 | 43 | | |
|
44 | 44 | | o 5: dc999528138a D |
@@ -66,9 +66,9 b' Multiple branching points caused by sele' | |||
|
66 | 66 | > | |
|
67 | 67 | > R |
|
68 | 68 | > EOS |
|
69 |
rebasing 2:c1e6b162678d "B" |
|
|
70 |
rebasing 3:d6003a550c2c "C" |
|
|
71 |
rebasing 6:54c8f00cb91c "E" |
|
|
69 | rebasing 2:c1e6b162678d B "B" | |
|
70 | rebasing 3:d6003a550c2c C "C" | |
|
71 | rebasing 6:54c8f00cb91c E tip "E" | |
|
72 | 72 | o 6: 00598421b616 E |
|
73 | 73 | |\ |
|
74 | 74 | | o 5: 6b3e11729672 C |
@@ -94,8 +94,8 b' Rebase should not extend the "--base" re' | |||
|
94 | 94 | > | |
|
95 | 95 | > R |
|
96 | 96 | > EOS |
|
97 |
rebasing 2:c1e6b162678d "B" |
|
|
98 |
rebasing 5:54c8f00cb91c "E" |
|
|
97 | rebasing 2:c1e6b162678d B "B" | |
|
98 | rebasing 5:54c8f00cb91c E tip "E" | |
|
99 | 99 | o 5: e583bf3ff54c E |
|
100 | 100 | |\ |
|
101 | 101 | | o 4: 85260910e847 B |
@@ -119,9 +119,9 b' Rebase should not simplify the "--base" ' | |||
|
119 | 119 | > | |
|
120 | 120 | > R |
|
121 | 121 | > EOS |
|
122 |
rebasing 2:c1e6b162678d "B" |
|
|
123 |
rebasing 3:d6003a550c2c "C" |
|
|
124 |
rebasing 5:54c8f00cb91c "E" |
|
|
122 | rebasing 2:c1e6b162678d B "B" | |
|
123 | rebasing 3:d6003a550c2c C "C" | |
|
124 | rebasing 5:54c8f00cb91c E tip "E" | |
|
125 | 125 | o 5: 00598421b616 E |
|
126 | 126 | |\ |
|
127 | 127 | | o 4: 6b3e11729672 C |
@@ -167,12 +167,12 b' Multiple branching points caused by mult' | |||
|
167 | 167 | > | |
|
168 | 168 | > R |
|
169 | 169 | > EOS |
|
170 |
rebasing 3:a113dbaa660a "B1" |
|
|
171 |
rebasing 5:06ce7b1cc8c2 "B2" |
|
|
172 |
rebasing 6:0ac98cce32d3 "C1" |
|
|
173 |
rebasing 8:781512f5e33d "C2" |
|
|
174 |
rebasing 9:428d8c18f641 "E1" |
|
|
175 |
rebasing 11:e1bf82f6b6df "E2" |
|
|
170 | rebasing 3:a113dbaa660a B1 "B1" | |
|
171 | rebasing 5:06ce7b1cc8c2 B2 "B2" | |
|
172 | rebasing 6:0ac98cce32d3 C1 "C1" | |
|
173 | rebasing 8:781512f5e33d C2 "C2" | |
|
174 | rebasing 9:428d8c18f641 E1 "E1" | |
|
175 | rebasing 11:e1bf82f6b6df E2 "E2" | |
|
176 | 176 | o 12: e4a37b6fdbd2 E2 |
|
177 | 177 | | |
|
178 | 178 | o 11: 9675bea983df E1 |
@@ -210,19 +210,19 b' Multiple branching points with multiple ' | |||
|
210 | 210 | > \|/ |/ |/ |
|
211 | 211 | > A A A |
|
212 | 212 | > EOS |
|
213 |
rebasing 2:dc0947a82db8 "C" |
|
|
214 |
rebasing 8:4e4f9194f9f1 "D" |
|
|
215 |
rebasing 9:03ca77807e91 "E" |
|
|
216 |
rebasing 10:afc707c82df0 "F" |
|
|
217 |
rebasing 13:690dfff91e9e "G" |
|
|
218 |
rebasing 14:2893b886bb10 "H" |
|
|
219 |
rebasing 3:08ebfeb61bac "I" |
|
|
220 |
rebasing 4:a0a5005cec67 "J" |
|
|
221 |
rebasing 5:83780307a7e8 "K" |
|
|
222 |
rebasing 6:e131637a1cb6 "L" |
|
|
223 |
rebasing 11:d1f6d0c3c7e4 "M" |
|
|
224 |
rebasing 12:7aaec6f81888 "N" |
|
|
225 |
rebasing 15:325bc8f1760d "P" |
|
|
213 | rebasing 2:dc0947a82db8 C "C" | |
|
214 | rebasing 8:4e4f9194f9f1 D "D" | |
|
215 | rebasing 9:03ca77807e91 E "E" | |
|
216 | rebasing 10:afc707c82df0 F "F" | |
|
217 | rebasing 13:690dfff91e9e G "G" | |
|
218 | rebasing 14:2893b886bb10 H "H" | |
|
219 | rebasing 3:08ebfeb61bac I "I" | |
|
220 | rebasing 4:a0a5005cec67 J "J" | |
|
221 | rebasing 5:83780307a7e8 K "K" | |
|
222 | rebasing 6:e131637a1cb6 L "L" | |
|
223 | rebasing 11:d1f6d0c3c7e4 M "M" | |
|
224 | rebasing 12:7aaec6f81888 N "N" | |
|
225 | rebasing 15:325bc8f1760d P tip "P" | |
|
226 | 226 | o 15: 6ef6a0ea3b18 P |
|
227 | 227 | |\ |
|
228 | 228 | | o 14: 20ba3610a7e5 N |
@@ -268,13 +268,13 b' Slightly more complex merge case (mentio' | |||
|
268 | 268 | > | |
|
269 | 269 | > M0 |
|
270 | 270 | > EOF |
|
271 |
rebasing 4:8817fae53c94 "C0" |
|
|
272 |
rebasing 6:06ca5dfe3b5b "B2" |
|
|
273 |
rebasing 7:73508237b032 "C1" |
|
|
274 |
rebasing 9:fdb955e2faed "A2" |
|
|
275 |
rebasing 11:4e449bd1a643 "A3" |
|
|
276 |
rebasing 10:0a33b0519128 "B1" |
|
|
277 |
rebasing 12:209327807c3a "B3" |
|
|
271 | rebasing 4:8817fae53c94 C0 "C0" | |
|
272 | rebasing 6:06ca5dfe3b5b B2 "B2" | |
|
273 | rebasing 7:73508237b032 C1 "C1" | |
|
274 | rebasing 9:fdb955e2faed A2 "A2" | |
|
275 | rebasing 11:4e449bd1a643 A3 "A3" | |
|
276 | rebasing 10:0a33b0519128 B1 "B1" | |
|
277 | rebasing 12:209327807c3a B3 tip "B3" | |
|
278 | 278 | o 12: ceb984566332 B3 |
|
279 | 279 | |\ |
|
280 | 280 | | o 11: 19d93caac497 B1 |
@@ -318,8 +318,8 b' Multiple roots. Roots are ancestors of d' | |||
|
318 | 318 | > \|\| |
|
319 | 319 | > C A |
|
320 | 320 | > EOF |
|
321 |
rebasing 2:112478962961 "B" |
|
|
322 |
rebasing 3:b70f76719894 "D" |
|
|
321 | rebasing 2:112478962961 B "B" | |
|
322 | rebasing 3:b70f76719894 D "D" | |
|
323 | 323 | o 4: 511efad7bf13 D |
|
324 | 324 | | |
|
325 | 325 | | o 3: 25c4e279af62 B |
@@ -349,8 +349,8 b' Multiple roots. One root is not an ances' | |||
|
349 | 349 | > \|\| |
|
350 | 350 | > A C |
|
351 | 351 | > EOF |
|
352 |
rebasing 2:f675d5a1c6a4 "B" |
|
|
353 |
rebasing 5:f68696fe6af8 "E" |
|
|
352 | rebasing 2:f675d5a1c6a4 B "B" | |
|
353 | rebasing 5:f68696fe6af8 E tip "E" | |
|
354 | 354 | o 5: f6e6f5081554 E |
|
355 | 355 | |\ |
|
356 | 356 | | o 4: 30cabcba27be B |
@@ -370,8 +370,8 b' Multiple roots. Two children share two p' | |||
|
370 | 370 | > \|\|\ |
|
371 | 371 | > A C A |
|
372 | 372 | > EOF |
|
373 |
rebasing 2:f675d5a1c6a4 "B" |
|
|
374 |
rebasing 3:c2a779e13b56 "D" |
|
|
373 | rebasing 2:f675d5a1c6a4 B "B" | |
|
374 | rebasing 3:c2a779e13b56 D "D" | |
|
375 | 375 | o 4: 5eecd056b5f8 D |
|
376 | 376 | |\ |
|
377 | 377 | +---o 3: 30cabcba27be B |
@@ -75,7 +75,7 b' Test deleting divergent bookmarks from d' | |||
|
75 | 75 | o 0: 1994f17a630e 'A' bookmarks: Y@diverge |
|
76 | 76 | |
|
77 | 77 | $ hg rebase -s Y -d 3 |
|
78 |
rebasing 2:49cb3485fa0c |
|
|
78 | rebasing 2:49cb3485fa0c Y Z "C" | |
|
79 | 79 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg |
|
80 | 80 | |
|
81 | 81 | $ hg tglog |
@@ -97,7 +97,7 b' Do not try to keep active but deleted di' | |||
|
97 | 97 | $ hg book W@diverge |
|
98 | 98 | |
|
99 | 99 | $ hg rebase -s W -d . |
|
100 |
rebasing 3:41acb9dca9eb |
|
|
100 | rebasing 3:41acb9dca9eb tip W "D" | |
|
101 | 101 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg |
|
102 | 102 | |
|
103 | 103 | $ hg bookmarks |
@@ -115,8 +115,8 b' Keep bookmarks to the correct rebased ch' | |||
|
115 | 115 | $ hg up -q Z |
|
116 | 116 | |
|
117 | 117 | $ hg rebase -s 1 -d 3 |
|
118 |
rebasing 1:6c81ed0049f8 "B" |
|
|
119 |
rebasing 2:49cb3485fa0c |
|
|
118 | rebasing 1:6c81ed0049f8 X "B" | |
|
119 | rebasing 2:49cb3485fa0c Y Z "C" | |
|
120 | 120 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg |
|
121 | 121 | |
|
122 | 122 | $ hg tglog |
@@ -138,8 +138,8 b' Keep active bookmark on the correct chan' | |||
|
138 | 138 | $ hg up -q X |
|
139 | 139 | |
|
140 | 140 | $ hg rebase -d W |
|
141 |
rebasing 1:6c81ed0049f8 "B" |
|
|
142 |
rebasing 2:49cb3485fa0c |
|
|
141 | rebasing 1:6c81ed0049f8 X "B" | |
|
142 | rebasing 2:49cb3485fa0c Y Z "C" | |
|
143 | 143 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg |
|
144 | 144 | |
|
145 | 145 | $ hg tglog |
@@ -169,7 +169,7 b' rebase --continue with bookmarks present' | |||
|
169 | 169 | $ hg up 3 |
|
170 | 170 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
171 | 171 | $ hg rebase --dest 4 |
|
172 |
rebasing 3:3d5fa227f4b5 |
|
|
172 | rebasing 3:3d5fa227f4b5 Y Z "C" | |
|
173 | 173 | merging c |
|
174 | 174 | warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
|
175 | 175 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -179,7 +179,7 b' rebase --continue with bookmarks present' | |||
|
179 | 179 | (no more unresolved files) |
|
180 | 180 | continue: hg rebase --continue |
|
181 | 181 | $ hg rebase --continue |
|
182 |
rebasing 3:3d5fa227f4b5 |
|
|
182 | rebasing 3:3d5fa227f4b5 Y Z "C" | |
|
183 | 183 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg |
|
184 | 184 | $ hg tglog |
|
185 | 185 | @ 4: 45c0f0ec1203 'C' bookmarks: Y Z |
@@ -209,7 +209,7 b' as --rev arguments (issue3950)' | |||
|
209 | 209 | $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z |
|
210 | 210 | rebasing 5:345c90f326a4 "bisect" |
|
211 | 211 | rebasing 6:f677a2907404 "bisect2" |
|
212 |
rebasing 7:325c16001345 |
|
|
212 | rebasing 7:325c16001345 tip bisect "bisect3" | |
|
213 | 213 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg |
|
214 | 214 | |
|
215 | 215 | Bookmark and working parent get moved even if --keep is set (issue5682) |
@@ -232,7 +232,7 b' Bookmark and working parent get moved ev' | |||
|
232 | 232 | o 0: 426bada5c675 'A' bookmarks: A |
|
233 | 233 | |
|
234 | 234 | $ hg rebase -r B -d C --keep |
|
235 |
rebasing 1:112478962961 "B" |
|
|
235 | rebasing 1:112478962961 B "B" | |
|
236 | 236 | $ hg tglog |
|
237 | 237 | @ 3: 9769fc65c4c5 'B' bookmarks: B |
|
238 | 238 | | |
@@ -165,7 +165,7 b' Rebase head of branch3 (8) onto branch2 ' | |||
|
165 | 165 | o 0: 'A' |
|
166 | 166 | |
|
167 | 167 | $ hg rebase -s 8 -d 6 |
|
168 |
rebasing 8:4666b71e8e32 "F" |
|
|
168 | rebasing 8:4666b71e8e32 tip "F" | |
|
169 | 169 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg |
|
170 | 170 | |
|
171 | 171 | $ hg branches |
@@ -232,7 +232,7 b' Rebase entire branch3 (7-8) onto branch2' | |||
|
232 | 232 | $ hg rebase -s 7 -d 6 |
|
233 | 233 | rebasing 7:653b9feb4616 "branch3" |
|
234 | 234 | note: not rebasing 7:653b9feb4616 "branch3", its destination already has all its changes |
|
235 |
rebasing 8:4666b71e8e32 "F" |
|
|
235 | rebasing 8:4666b71e8e32 tip "F" | |
|
236 | 236 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg |
|
237 | 237 | |
|
238 | 238 | $ hg branches |
@@ -478,6 +478,6 b' Turn most changeset public' | |||
|
478 | 478 | $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e |
|
479 | 479 | rebasing 5:361a99976cc9 "F" |
|
480 | 480 | HGEDITFORM=rebase.merge |
|
481 |
rebasing 8:326cfedc031c "I" |
|
|
481 | rebasing 8:326cfedc031c tip "I" | |
|
482 | 482 | HGEDITFORM=rebase.normal |
|
483 | 483 | saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg |
@@ -123,7 +123,7 b' Rebase F onto E - check keepbranches:' | |||
|
123 | 123 | o 0:draft 'A' |
|
124 | 124 | |
|
125 | 125 | $ hg rebase -s 5 -d 4 --keepbranches |
|
126 |
rebasing 5:01e6ebbd8272 "F" |
|
|
126 | rebasing 5:01e6ebbd8272 tip "F" | |
|
127 | 127 | merging A |
|
128 | 128 | warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
|
129 | 129 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -137,7 +137,7 b' Solve the conflict and go on:' | |||
|
137 | 137 | (no more unresolved files) |
|
138 | 138 | continue: hg rebase --continue |
|
139 | 139 | $ hg rebase --continue |
|
140 |
rebasing 5:01e6ebbd8272 "F" |
|
|
140 | rebasing 5:01e6ebbd8272 tip "F" | |
|
141 | 141 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-rebase.hg |
|
142 | 142 | |
|
143 | 143 | $ hg tglog |
@@ -35,9 +35,9 b' Highest phase of source commits is used:' | |||
|
35 | 35 | > echo "edited manually" >> \$1 |
|
36 | 36 | > EOF |
|
37 | 37 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --source B --dest F |
|
38 |
rebasing 1:112478962961 "B" |
|
|
39 |
rebasing 3:26805aba1e60 "C" |
|
|
40 |
rebasing 5:f585351a92f8 "D" |
|
|
38 | rebasing 1:112478962961 B "B" | |
|
39 | rebasing 3:26805aba1e60 C "C" | |
|
40 | rebasing 5:f585351a92f8 D tip "D" | |
|
41 | 41 | ==== before editing |
|
42 | 42 | Collapsed revision |
|
43 | 43 | * B |
@@ -96,8 +96,8 b' Merge gets linearized:' | |||
|
96 | 96 | |
|
97 | 97 | $ hg phase --force --secret D |
|
98 | 98 | $ hg rebase --source B --collapse --dest F |
|
99 |
rebasing 1:112478962961 "B" |
|
|
100 |
rebasing 3:4e4f9194f9f1 "D" |
|
|
99 | rebasing 1:112478962961 B "B" | |
|
100 | rebasing 3:4e4f9194f9f1 D "D" | |
|
101 | 101 | saved backup bundle to $TESTTMP/linearized-merge/.hg/strip-backup/112478962961-e389075b-rebase.hg |
|
102 | 102 | |
|
103 | 103 | $ hg tglog |
@@ -141,8 +141,8 b' Custom message:' | |||
|
141 | 141 | > true |
|
142 | 142 | > EOF |
|
143 | 143 | $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source B --collapse -m 'custom message' -e --dest D |
|
144 |
rebasing 1:112478962961 "B" |
|
|
145 |
rebasing 3:26805aba1e60 "C" |
|
|
144 | rebasing 1:112478962961 B "B" | |
|
145 | rebasing 3:26805aba1e60 C tip "C" | |
|
146 | 146 | HGEDITFORM=rebase.collapse |
|
147 | 147 | saved backup bundle to $TESTTMP/message/.hg/strip-backup/112478962961-f4131707-rebase.hg |
|
148 | 148 | |
@@ -185,9 +185,9 b' Rebase and collapse - more than one exte' | |||
|
185 | 185 | Rebase and collapse - E onto H: |
|
186 | 186 | |
|
187 | 187 | $ hg rebase -s E --dest H --collapse # root (E) is not a merge |
|
188 |
rebasing 5:49cb92066bfd "E" |
|
|
189 |
rebasing 6:11abe3fb10b8 "F" |
|
|
190 |
rebasing 7:64e264db77f0 "G" |
|
|
188 | rebasing 5:49cb92066bfd E "E" | |
|
189 | rebasing 6:11abe3fb10b8 F "F" | |
|
190 | rebasing 7:64e264db77f0 G tip "G" | |
|
191 | 191 | saved backup bundle to $TESTTMP/multiple-external-parents/.hg/strip-backup/49cb92066bfd-ee8a8a79-rebase.hg |
|
192 | 192 | |
|
193 | 193 | $ hg tglog |
@@ -287,7 +287,7 b' Preserves external parent' | |||
|
287 | 287 | > EOF |
|
288 | 288 | |
|
289 | 289 | $ hg rebase -s F --dest I --collapse # root (F) is not a merge |
|
290 |
rebasing 6:c82b08f646f1 "F" |
|
|
290 | rebasing 6:c82b08f646f1 F "F" | |
|
291 | 291 | file 'E' was deleted in local [dest] but was modified in other [source]. |
|
292 | 292 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
|
293 | 293 | What do you want to do? u |
@@ -299,9 +299,9 b' Preserves external parent' | |||
|
299 | 299 | (no more unresolved files) |
|
300 | 300 | continue: hg rebase --continue |
|
301 | 301 | $ hg rebase -c |
|
302 |
rebasing 6:c82b08f646f1 "F" |
|
|
303 |
rebasing 7:a6db7fa104e1 "G" |
|
|
304 |
rebasing 8:e1d201b72d91 "H" |
|
|
302 | rebasing 6:c82b08f646f1 F "F" | |
|
303 | rebasing 7:a6db7fa104e1 G "G" | |
|
304 | rebasing 8:e1d201b72d91 H tip "H" | |
|
305 | 305 | saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg |
|
306 | 306 | |
|
307 | 307 | $ hg tglog |
@@ -347,8 +347,8 b' Rebasing from multiple bases:' | |||
|
347 | 347 | > A |
|
348 | 348 | > EOF |
|
349 | 349 | $ hg rebase --collapse -r 'B+C' -d D |
|
350 |
rebasing 1:fc2b737bb2e5 "B" |
|
|
351 |
rebasing 2:dc0947a82db8 "C" |
|
|
350 | rebasing 1:fc2b737bb2e5 B "B" | |
|
351 | rebasing 2:dc0947a82db8 C "C" | |
|
352 | 352 | saved backup bundle to $TESTTMP/multiple-bases/.hg/strip-backup/dc0947a82db8-b0c1a7ea-rebase.hg |
|
353 | 353 | $ hg tglog |
|
354 | 354 | o 2: 2127ae44d291 'Collapsed revision |
@@ -424,10 +424,10 b' With internal merge:' | |||
|
424 | 424 | |
|
425 | 425 | |
|
426 | 426 | $ hg rebase -s B --collapse --dest F |
|
427 |
rebasing 1:112478962961 "B" |
|
|
428 |
rebasing 3:26805aba1e60 "C" |
|
|
429 |
rebasing 4:be0ef73c17ad "D" |
|
|
430 |
rebasing 5:02c4367d6973 "E" |
|
|
427 | rebasing 1:112478962961 B "B" | |
|
428 | rebasing 3:26805aba1e60 C "C" | |
|
429 | rebasing 4:be0ef73c17ad D "D" | |
|
430 | rebasing 5:02c4367d6973 E tip "E" | |
|
431 | 431 | saved backup bundle to $TESTTMP/internal-merge/.hg/strip-backup/112478962961-1dfb057b-rebase.hg |
|
432 | 432 | |
|
433 | 433 | $ hg tglog |
@@ -514,7 +514,7 b' Rebase, collapse and copies' | |||
|
514 | 514 | merging a and d to d |
|
515 | 515 | merging b and e to e |
|
516 | 516 | merging c and f to f |
|
517 |
rebasing 3:338e84e2e558 "move2" |
|
|
517 | rebasing 3:338e84e2e558 tip "move2" | |
|
518 | 518 | merging f and c to c |
|
519 | 519 | merging e and g to g |
|
520 | 520 | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-rebase.hg |
@@ -557,7 +557,7 b' Test collapsing in place' | |||
|
557 | 557 | |
|
558 | 558 | $ hg rebase --collapse -b . -d 0 |
|
559 | 559 | rebasing 1:1352765a01d4 "change" |
|
560 |
rebasing 2:64b456429f67 "Collapsed revision" |
|
|
560 | rebasing 2:64b456429f67 tip "Collapsed revision" | |
|
561 | 561 | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg |
|
562 | 562 | $ hg st --change tip --copies |
|
563 | 563 | M a |
@@ -631,7 +631,7 b' Test collapsing changes that add then re' | |||
|
631 | 631 | $ hg book foo |
|
632 | 632 | $ hg rebase -d 0 -r "1::2" --collapse -m collapsed |
|
633 | 633 | rebasing 1:6d8d9f24eec3 "a" |
|
634 |
rebasing 2:1cc73eca5ecc "b" |
|
|
634 | rebasing 2:1cc73eca5ecc tip foo "b" | |
|
635 | 635 | saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg |
|
636 | 636 | $ hg log -G --template "{rev}: '{desc}' {bookmarks}" |
|
637 | 637 | @ 1: 'collapsed' foo |
@@ -655,7 +655,7 b' running into merge conflict and invoking' | |||
|
655 | 655 | > A |
|
656 | 656 | > EOF |
|
657 | 657 | $ hg rebase --collapse -m "new message" -b B -d C |
|
658 |
rebasing 1:81e5401e4d37 "B" |
|
|
658 | rebasing 1:81e5401e4d37 B "B" | |
|
659 | 659 | merging A |
|
660 | 660 | warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
|
661 | 661 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -665,7 +665,7 b' running into merge conflict and invoking' | |||
|
665 | 665 | (no more unresolved files) |
|
666 | 666 | continue: hg rebase --continue |
|
667 | 667 | $ hg rebase --continue |
|
668 |
rebasing 1:81e5401e4d37 "B" |
|
|
668 | rebasing 1:81e5401e4d37 B "B" | |
|
669 | 669 | saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/81e5401e4d37-96c3dd30-rebase.hg |
|
670 | 670 | $ hg log |
|
671 | 671 | changeset: 2:17186933e123 |
@@ -702,7 +702,7 b' Test aborted editor on final message' | |||
|
702 | 702 | > A |
|
703 | 703 | > EOF |
|
704 | 704 | $ hg rebase --collapse -t internal:merge3 -s B -d D |
|
705 |
rebasing 1:f899f3910ce7 "B" |
|
|
705 | rebasing 1:f899f3910ce7 B "B" | |
|
706 | 706 | merging A |
|
707 | 707 | warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
|
708 | 708 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -729,8 +729,8 b' Test aborted editor on final message' | |||
|
729 | 729 | (no more unresolved files) |
|
730 | 730 | continue: hg rebase --continue |
|
731 | 731 | $ hg rebase --continue |
|
732 |
rebasing 1:f899f3910ce7 "B" |
|
|
733 |
rebasing 3:63668d570d21 "C" |
|
|
732 | rebasing 1:f899f3910ce7 B "B" | |
|
733 | rebasing 3:63668d570d21 C tip "C" | |
|
734 | 734 | merging A |
|
735 | 735 | warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
|
736 | 736 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -757,8 +757,8 b' Test aborted editor on final message' | |||
|
757 | 757 | (no more unresolved files) |
|
758 | 758 | continue: hg rebase --continue |
|
759 | 759 | $ HGEDITOR=false hg rebase --continue --config ui.interactive=1 |
|
760 |
already rebased 1:f899f3910ce7 "B" |
|
|
761 |
rebasing 3:63668d570d21 "C" |
|
|
760 | already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185 | |
|
761 | rebasing 3:63668d570d21 C tip "C" | |
|
762 | 762 | abort: edit failed: false exited with status 1 |
|
763 | 763 | [255] |
|
764 | 764 | $ hg tglog |
@@ -771,6 +771,6 b' Test aborted editor on final message' | |||
|
771 | 771 | o 0: 4a2df7238c3b 'A' |
|
772 | 772 | |
|
773 | 773 | $ hg rebase --continue |
|
774 |
already rebased 1:f899f3910ce7 "B" |
|
|
775 |
already rebased 3:63668d570d21 "C" |
|
|
774 | already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185 | |
|
775 | already rebased 3:63668d570d21 C tip "C" as 82b8abf9c185 | |
|
776 | 776 | saved backup bundle to $TESTTMP/aborted-editor/.hg/strip-backup/f899f3910ce7-7cab5e15-rebase.hg |
@@ -100,7 +100,7 b' Conclude rebase:' | |||
|
100 | 100 | $ hg rebase --continue |
|
101 | 101 | already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
|
102 | 102 | rebasing 4:46f0b057b5c0 "L2" |
|
103 |
rebasing 5:8029388f38dc "L3" |
|
|
103 | rebasing 5:8029388f38dc mybook "L3" | |
|
104 | 104 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg |
|
105 | 105 | |
|
106 | 106 | $ hg tglog |
@@ -261,7 +261,7 b' Check that the right ancestors is used w' | |||
|
261 | 261 | updating the branch cache |
|
262 | 262 | rebased as 19c888675e13 |
|
263 | 263 | rebase status stored |
|
264 |
rebasing 10:2f2496ddf49d "merge" |
|
|
264 | rebasing 10:2f2496ddf49d tip "merge" | |
|
265 | 265 | future parents are 11 and 7 |
|
266 | 266 | already in destination |
|
267 | 267 | merge against 10:2f2496ddf49d |
@@ -341,7 +341,7 b' Test minimization of merge conflicts' | |||
|
341 | 341 | $ echo c >> a |
|
342 | 342 | $ hg commit -q -m 'abc' |
|
343 | 343 | $ hg rebase -s 7bc217434fc1 -d ab --keep |
|
344 |
rebasing 13:7bc217434fc1 "abc" |
|
|
344 | rebasing 13:7bc217434fc1 tip "abc" | |
|
345 | 345 | merging a |
|
346 | 346 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
347 | 347 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -361,7 +361,7 b' Test minimization of merge conflicts' | |||
|
361 | 361 | rebase aborted |
|
362 | 362 | $ hg up -q -C 7bc217434fc1 |
|
363 | 363 | $ hg rebase -s . -d ab --keep -t internal:merge3 |
|
364 |
rebasing 13:7bc217434fc1 "abc" |
|
|
364 | rebasing 13:7bc217434fc1 tip "abc" | |
|
365 | 365 | merging a |
|
366 | 366 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
367 | 367 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -399,7 +399,7 b' Test rebase with obsstore turned on and ' | |||
|
399 | 399 | $ echo 3 > B |
|
400 | 400 | $ hg commit --amend -m E -A B -q |
|
401 | 401 | $ hg rebase -r B+D -d . --config experimental.evolution=true |
|
402 |
rebasing 1:112478962961 "B" |
|
|
402 | rebasing 1:112478962961 B "B" | |
|
403 | 403 | merging B |
|
404 | 404 | warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
|
405 | 405 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -410,8 +410,8 b' Test rebase with obsstore turned on and ' | |||
|
410 | 410 | (no more unresolved files) |
|
411 | 411 | continue: hg rebase --continue |
|
412 | 412 | $ hg rebase --continue --config experimental.evolution=none |
|
413 |
rebasing 1:112478962961 "B" |
|
|
414 |
rebasing 3:f585351a92f8 "D" |
|
|
413 | rebasing 1:112478962961 B "B" | |
|
414 | rebasing 3:f585351a92f8 D "D" | |
|
415 | 415 | warning: orphaned descendants detected, not stripping 112478962961 |
|
416 | 416 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg |
|
417 | 417 | |
@@ -448,10 +448,10 b' Test where the conflict happens when reb' | |||
|
448 | 448 | $ hg co F |
|
449 | 449 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
450 | 450 | $ hg rebase -d B |
|
451 |
rebasing 2:dc0947a82db8 "C" |
|
|
452 |
rebasing 3:e7b3f00ed42e "D" |
|
|
453 |
rebasing 4:03ca77807e91 "E" |
|
|
454 |
rebasing 5:9a6b91dc2044 "F" |
|
|
451 | rebasing 2:dc0947a82db8 C "C" | |
|
452 | rebasing 3:e7b3f00ed42e D "D" | |
|
453 | rebasing 4:03ca77807e91 E "E" | |
|
454 | rebasing 5:9a6b91dc2044 F tip "F" | |
|
455 | 455 | merging conflict |
|
456 | 456 | warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark') |
|
457 | 457 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -480,10 +480,10 b' Test where the conflict happens when reb' | |||
|
480 | 480 | (no more unresolved files) |
|
481 | 481 | continue: hg rebase --continue |
|
482 | 482 | $ hg rebase -c |
|
483 |
already rebased 2:dc0947a82db8 "C" |
|
|
484 |
already rebased 3:e7b3f00ed42e "D" |
|
|
485 |
already rebased 4:03ca77807e91 "E" |
|
|
486 |
rebasing 5:9a6b91dc2044 "F" |
|
|
483 | already rebased 2:dc0947a82db8 C "C" as 0199610c343e | |
|
484 | already rebased 3:e7b3f00ed42e D "D" as f0dd538aaa63 | |
|
485 | already rebased 4:03ca77807e91 E "E" as cbf25af8347d | |
|
486 | rebasing 5:9a6b91dc2044 F "F" | |
|
487 | 487 | saved backup bundle to $TESTTMP/conflict-in-merge/.hg/strip-backup/dc0947a82db8-ca7e7d5b-rebase.hg |
|
488 | 488 | $ hg tglog |
|
489 | 489 | @ 5:draft 'F' |
@@ -20,15 +20,15 b' Require a destination' | |||
|
20 | 20 | (use: hg rebase -d REV) |
|
21 | 21 | [255] |
|
22 | 22 | $ hg rebase -d 1 |
|
23 |
rebasing 2:5db65b93a12b "cc" |
|
|
23 | rebasing 2:5db65b93a12b tip "cc" | |
|
24 | 24 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-rebase.hg |
|
25 | 25 | $ hg rebase -d 0 -r . -q |
|
26 | 26 | $ HGPLAIN=1 hg rebase |
|
27 |
rebasing 2:889b0bc6a730 "cc" |
|
|
27 | rebasing 2:889b0bc6a730 tip "cc" | |
|
28 | 28 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-rebase.hg |
|
29 | 29 | $ hg rebase -d 0 -r . -q |
|
30 | 30 | $ hg --config commands.rebase.requiredest=False rebase |
|
31 |
rebasing 2:279de9495438 "cc" |
|
|
31 | rebasing 2:279de9495438 tip "cc" | |
|
32 | 32 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-rebase.hg |
|
33 | 33 | |
|
34 | 34 | Requiring dest should not break continue or other rebase options |
@@ -45,7 +45,7 b' Requiring dest should not break continue' | |||
|
45 | 45 | o 0 aa |
|
46 | 46 | |
|
47 | 47 | $ hg rebase -d 2 |
|
48 |
rebasing 3:0537f6b50def "dc" |
|
|
48 | rebasing 3:0537f6b50def tip "dc" | |
|
49 | 49 | merging c |
|
50 | 50 | warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
|
51 | 51 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -55,7 +55,7 b' Requiring dest should not break continue' | |||
|
55 | 55 | (no more unresolved files) |
|
56 | 56 | continue: hg rebase --continue |
|
57 | 57 | $ hg rebase --continue |
|
58 |
rebasing 3:0537f6b50def "dc" |
|
|
58 | rebasing 3:0537f6b50def tip "dc" | |
|
59 | 59 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg |
|
60 | 60 | |
|
61 | 61 | $ cd .. |
@@ -171,9 +171,9 b' Rebase to null should work:' | |||
|
171 | 171 | > | | |
|
172 | 172 | > A B |
|
173 | 173 | > EOS |
|
174 |
already rebased 0:426bada5c675 "A" |
|
|
175 |
already rebased 2:dc0947a82db8 "C" |
|
|
176 |
rebasing 3:004dc1679908 "D" |
|
|
174 | already rebased 0:426bada5c675 A "A" | |
|
175 | already rebased 2:dc0947a82db8 C "C" | |
|
176 | rebasing 3:004dc1679908 D tip "D" | |
|
177 | 177 | o 4: d8d8601abd5e D |
|
178 | 178 | |
|
179 | 179 | o 2: dc0947a82db8 C |
@@ -227,10 +227,10 b' Switch roots:' | |||
|
227 | 227 | > | | |
|
228 | 228 | > A D |
|
229 | 229 | > EOS |
|
230 |
rebasing 2:112478962961 "B" |
|
|
231 |
rebasing 4:26805aba1e60 "C" |
|
|
232 |
rebasing 3:cd488e83d208 "E" |
|
|
233 |
rebasing 5:0069ba24938a |
|
|
230 | rebasing 2:112478962961 B "B" | |
|
231 | rebasing 4:26805aba1e60 C "C" | |
|
232 | rebasing 3:cd488e83d208 E "E" | |
|
233 | rebasing 5:0069ba24938a F tip "F" | |
|
234 | 234 | o 9: d150ff263fc8 F |
|
235 | 235 | | |
|
236 | 236 | o 8: 66f30a1a2eab E |
@@ -254,8 +254,8 b' Different destinations for merge changes' | |||
|
254 | 254 | > |\| |
|
255 | 255 | > A D |
|
256 | 256 | > EOS |
|
257 |
rebasing 3:a4256619d830 "B" |
|
|
258 |
rebasing 6:8e139e245220 |
|
|
257 | rebasing 3:a4256619d830 B "B" | |
|
258 | rebasing 6:8e139e245220 C tip "C" | |
|
259 | 259 | o 8: d7d1169e9b1c C |
|
260 | 260 | |\ |
|
261 | 261 | | o 7: 2ed0c8546285 B |
@@ -283,9 +283,9 b' Move to a previous parent:' | |||
|
283 | 283 | > |/ |
|
284 | 284 | > A |
|
285 | 285 | > EOS |
|
286 |
rebasing 4:33441538d4aa "F" |
|
|
287 |
rebasing 6:cf43ad9da869 "G" |
|
|
288 |
rebasing 7:eef94f3b5f03 |
|
|
286 | rebasing 4:33441538d4aa F "F" | |
|
287 | rebasing 6:cf43ad9da869 G "G" | |
|
288 | rebasing 7:eef94f3b5f03 H tip "H" | |
|
289 | 289 | o 10: b3d84c6666cf H |
|
290 | 290 | | |
|
291 | 291 | | o 5: f585351a92f8 D |
@@ -309,8 +309,8 b' Source overlaps with destination:' | |||
|
309 | 309 | > \|/ |
|
310 | 310 | > A |
|
311 | 311 | > EOS |
|
312 |
rebasing 2:dc0947a82db8 "C" |
|
|
313 |
rebasing 1:112478962961 "B" |
|
|
312 | rebasing 2:dc0947a82db8 C "C" | |
|
313 | rebasing 1:112478962961 B "B" | |
|
314 | 314 | o 5: 5fe9935d5222 B |
|
315 | 315 | | |
|
316 | 316 | o 4: 12d20731b9e0 C |
@@ -352,11 +352,11 b' Detect source is ancestor of dest in run' | |||
|
352 | 352 | > \|/ |
|
353 | 353 | > A |
|
354 | 354 | > EOS |
|
355 |
already rebased 1:112478962961 "B" |
|
|
356 |
already rebased 2:dc0947a82db8 "C" |
|
|
357 |
already rebased 3:b18e25de2cf5 "D" |
|
|
358 |
already rebased 4:312782b8f06e "E" |
|
|
359 |
already rebased 5:ad6717a6a58e |
|
|
355 | already rebased 1:112478962961 B "B" | |
|
356 | already rebased 2:dc0947a82db8 C "C" | |
|
357 | already rebased 3:b18e25de2cf5 D "D" | |
|
358 | already rebased 4:312782b8f06e E "E" | |
|
359 | already rebased 5:ad6717a6a58e F tip "F" | |
|
360 | 360 | o 5: ad6717a6a58e F |
|
361 | 361 | | |
|
362 | 362 | o 3: b18e25de2cf5 D |
@@ -380,17 +380,17 b' Massively rewrite the DAG:' | |||
|
380 | 380 | > \| | |
|
381 | 381 | > A H |
|
382 | 382 | > EOS |
|
383 |
rebasing 4:701514e1408d "I" |
|
|
384 |
rebasing 0:426bada5c675 "A" |
|
|
385 |
rebasing 1:e7050b6e5048 "H" |
|
|
386 |
rebasing 5:26805aba1e60 "C" |
|
|
387 |
rebasing 7:cf89f86b485b "J" |
|
|
388 |
rebasing 2:112478962961 "B" |
|
|
389 |
rebasing 3:7fb047a69f22 "E" |
|
|
390 |
rebasing 8:f585351a92f8 "D" |
|
|
391 |
rebasing 10:ae41898d7875 |
|
|
392 |
rebasing 9:711f53bbef0b "G" |
|
|
393 |
rebasing 6:64a8289d2492 "F" |
|
|
383 | rebasing 4:701514e1408d I "I" | |
|
384 | rebasing 0:426bada5c675 A "A" | |
|
385 | rebasing 1:e7050b6e5048 H "H" | |
|
386 | rebasing 5:26805aba1e60 C "C" | |
|
387 | rebasing 7:cf89f86b485b J "J" | |
|
388 | rebasing 2:112478962961 B "B" | |
|
389 | rebasing 3:7fb047a69f22 E "E" | |
|
390 | rebasing 8:f585351a92f8 D "D" | |
|
391 | rebasing 10:ae41898d7875 K tip "K" | |
|
392 | rebasing 9:711f53bbef0b G "G" | |
|
393 | rebasing 6:64a8289d2492 F "F" | |
|
394 | 394 | o 21: 3735afb3713a F |
|
395 | 395 | | |
|
396 | 396 | o 20: 07698142d7a7 G |
@@ -433,12 +433,12 b' Resolve instability:' | |||
|
433 | 433 | > A |
|
434 | 434 | > EOF |
|
435 | 435 | 6 new orphan changesets |
|
436 |
rebasing 16:5c432343bf59 |
|
|
437 |
rebasing 3:26805aba1e60 "C" |
|
|
438 |
rebasing 6:f585351a92f8 "D" |
|
|
439 |
rebasing 10:ffebc37c5d0b "E3" |
|
|
440 |
rebasing 13:fb184bcfeee8 "F2" |
|
|
441 |
rebasing 11:dc838ab4c0da "G" |
|
|
436 | rebasing 16:5c432343bf59 J tip "J" | |
|
437 | rebasing 3:26805aba1e60 C "C" | |
|
438 | rebasing 6:f585351a92f8 D "D" | |
|
439 | rebasing 10:ffebc37c5d0b E3 "E3" | |
|
440 | rebasing 13:fb184bcfeee8 F2 "F2" | |
|
441 | rebasing 11:dc838ab4c0da G "G" | |
|
442 | 442 | o 22: 174f63d574a8 G |
|
443 | 443 | | |
|
444 | 444 | o 21: c9d9fbe76705 F2 |
@@ -24,7 +24,7 b' Rebasing D onto B detaching from C (one ' | |||
|
24 | 24 | $ hg phase --force --secret D |
|
25 | 25 | |
|
26 | 26 | $ hg rebase -s D -d B |
|
27 |
rebasing 3:e7b3f00ed42e "D" |
|
|
27 | rebasing 3:e7b3f00ed42e D tip "D" | |
|
28 | 28 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/e7b3f00ed42e-6f368371-rebase.hg |
|
29 | 29 | |
|
30 | 30 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
@@ -60,8 +60,8 b' Rebasing D onto B detaching from C (two ' | |||
|
60 | 60 | > EOF |
|
61 | 61 | |
|
62 | 62 | $ hg rebase -s D -d B |
|
63 |
rebasing 3:e7b3f00ed42e "D" |
|
|
64 |
rebasing 4:69a34c08022a "E" |
|
|
63 | rebasing 3:e7b3f00ed42e D "D" | |
|
64 | rebasing 4:69a34c08022a E tip "E" | |
|
65 | 65 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg |
|
66 | 66 | |
|
67 | 67 | $ hg tglog |
@@ -97,8 +97,8 b' Rebasing C onto B using detach (same as ' | |||
|
97 | 97 | > EOF |
|
98 | 98 | |
|
99 | 99 | $ hg rebase -s C -d B |
|
100 |
rebasing 2:dc0947a82db8 "C" |
|
|
101 |
rebasing 3:e7b3f00ed42e "D" |
|
|
100 | rebasing 2:dc0947a82db8 C "C" | |
|
101 | rebasing 3:e7b3f00ed42e D tip "D" | |
|
102 | 102 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg |
|
103 | 103 | |
|
104 | 104 | $ hg tglog |
@@ -136,8 +136,8 b' Rebasing D onto B detaching from C and c' | |||
|
136 | 136 | $ hg phase --force --secret E |
|
137 | 137 | |
|
138 | 138 | $ hg rebase --collapse -s D -d B |
|
139 |
rebasing 3:e7b3f00ed42e "D" |
|
|
140 |
rebasing 4:69a34c08022a "E" |
|
|
139 | rebasing 3:e7b3f00ed42e D "D" | |
|
140 | rebasing 4:69a34c08022a E tip "E" | |
|
141 | 141 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg |
|
142 | 142 | |
|
143 | 143 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
@@ -173,9 +173,9 b' Rebasing across null as ancestor' | |||
|
173 | 173 | > EOF |
|
174 | 174 | |
|
175 | 175 | $ hg rebase -s C -d B |
|
176 |
rebasing 2:dc0947a82db8 "C" |
|
|
177 |
rebasing 3:e7b3f00ed42e "D" |
|
|
178 |
rebasing 4:69a34c08022a "E" |
|
|
176 | rebasing 2:dc0947a82db8 C "C" | |
|
177 | rebasing 3:e7b3f00ed42e D "D" | |
|
178 | rebasing 4:69a34c08022a E tip "E" | |
|
179 | 179 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg |
|
180 | 180 | |
|
181 | 181 | $ hg tglog |
@@ -191,7 +191,7 b' Rebasing across null as ancestor' | |||
|
191 | 191 | |
|
192 | 192 | $ hg rebase -d 1 -s 3 |
|
193 | 193 | rebasing 3:e9153d36a1af "D" |
|
194 |
rebasing 4:e3d0c70d606d "E" |
|
|
194 | rebasing 4:e3d0c70d606d tip "E" | |
|
195 | 195 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg |
|
196 | 196 | $ hg tglog |
|
197 | 197 | o 4: 2c24e540eccd 'E' |
@@ -248,9 +248,9 b' Verify that target is not selected as ex' | |||
|
248 | 248 | o 0: 426bada5c675 'A' |
|
249 | 249 | |
|
250 | 250 | $ hg rebase -s I -d H --collapse --config ui.merge=internal:other |
|
251 |
rebasing 5:b92d164ad3cb |
|
|
251 | rebasing 5:b92d164ad3cb I "I" | |
|
252 | 252 | rebasing 6:0cfbc7e8faaf "Merge" |
|
253 |
rebasing 7:c6aaf0d259c0 |
|
|
253 | rebasing 7:c6aaf0d259c0 tip "J" | |
|
254 | 254 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg |
|
255 | 255 | |
|
256 | 256 | $ hg tglog |
@@ -294,7 +294,7 b' Ensure --continue restores a correct sta' | |||
|
294 | 294 | adding B |
|
295 | 295 | $ hg phase --force --secret . |
|
296 | 296 | $ hg rebase -s . -d B --config ui.merge=internal:merge |
|
297 |
rebasing 3:17b4880d2402 "B2" |
|
|
297 | rebasing 3:17b4880d2402 tip "B2" | |
|
298 | 298 | merging B |
|
299 | 299 | warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
|
300 | 300 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -303,8 +303,8 b' Ensure --continue restores a correct sta' | |||
|
303 | 303 | (no more unresolved files) |
|
304 | 304 | continue: hg rebase --continue |
|
305 | 305 | $ hg rebase -c |
|
306 |
rebasing 3:17b4880d2402 "B2" |
|
|
307 |
note: not rebasing 3:17b4880d2402 "B2" |
|
|
306 | rebasing 3:17b4880d2402 tip "B2" | |
|
307 | note: not rebasing 3:17b4880d2402 tip "B2", its destination already has all its changes | |
|
308 | 308 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg |
|
309 | 309 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
|
310 | 310 | o 2:draft 'C' |
@@ -24,15 +24,15 b' With rewrite.empty-successor=skip, b2 is' | |||
|
24 | 24 | |
|
25 | 25 | $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=skip --dry-run |
|
26 | 26 | starting dry-run rebase; repository will not be changed |
|
27 |
rebasing 2:6e2aad5e0f3c "b2" |
|
|
28 |
note: not rebasing 2:6e2aad5e0f3c "b2" |
|
|
27 | rebasing 2:6e2aad5e0f3c tip "b2" | |
|
28 | note: not rebasing 2:6e2aad5e0f3c tip "b2", its destination already has all its changes | |
|
29 | 29 | dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase |
|
30 | 30 | |
|
31 | 31 | With rewrite.empty-successor=keep, b2 will be recreated although it became empty. |
|
32 | 32 | |
|
33 | 33 | $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=keep |
|
34 |
rebasing 2:6e2aad5e0f3c "b2" |
|
|
35 |
note: created empty successor for 2:6e2aad5e0f3c "b2" |
|
|
34 | rebasing 2:6e2aad5e0f3c tip "b2" | |
|
35 | note: created empty successor for 2:6e2aad5e0f3c tip "b2", its destination already has all its changes | |
|
36 | 36 | saved backup bundle to $TESTTMP/.hg/strip-backup/6e2aad5e0f3c-7d7c8801-rebase.hg |
|
37 | 37 | |
|
38 | 38 | $ hg tglog |
@@ -50,10 +50,10 b'' | |||
|
50 | 50 | With --keep, bookmark should move |
|
51 | 51 | |
|
52 | 52 | $ hg rebase -r 3+4 -d E --keep |
|
53 |
rebasing 3:e7b3f00ed42e "D" |
|
|
54 |
note: not rebasing 3:e7b3f00ed42e "D" |
|
|
55 |
rebasing 4:69a34c08022a "E" |
|
|
56 |
note: not rebasing 4:69a34c08022a "E" |
|
|
53 | rebasing 3:e7b3f00ed42e BOOK-D "D" | |
|
54 | note: not rebasing 3:e7b3f00ed42e BOOK-D "D", its destination already has all its changes | |
|
55 | rebasing 4:69a34c08022a BOOK-E "E" | |
|
56 | note: not rebasing 4:69a34c08022a BOOK-E "E", its destination already has all its changes | |
|
57 | 57 | $ hg log -G -T '{rev} {desc} {bookmarks}' |
|
58 | 58 | o 7 E BOOK-D BOOK-E |
|
59 | 59 | | |
@@ -82,12 +82,12 b' still introduced by an ancestor of chang' | |||
|
82 | 82 | "BOOK-D", and "BOOK-E" include changes introduced by "C". |
|
83 | 83 | |
|
84 | 84 | $ hg rebase -s 2 -d E |
|
85 |
rebasing 2:dc0947a82db8 |
|
|
86 |
rebasing 3:e7b3f00ed42e "D" |
|
|
87 |
note: not rebasing 3:e7b3f00ed42e "D" |
|
|
88 |
rebasing 4:69a34c08022a "E" |
|
|
89 |
note: not rebasing 4:69a34c08022a "E" |
|
|
90 |
rebasing 5:6b2aeab91270 |
|
|
85 | rebasing 2:dc0947a82db8 C BOOK-C "C" | |
|
86 | rebasing 3:e7b3f00ed42e BOOK-D "D" | |
|
87 | note: not rebasing 3:e7b3f00ed42e BOOK-D "D", its destination already has all its changes | |
|
88 | rebasing 4:69a34c08022a BOOK-E "E" | |
|
89 | note: not rebasing 4:69a34c08022a BOOK-E "E", its destination already has all its changes | |
|
90 | rebasing 5:6b2aeab91270 F BOOK-F "F" | |
|
91 | 91 | saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg |
|
92 | 92 | $ hg log -G -T '{rev} {desc} {bookmarks}' |
|
93 | 93 | o 5 F BOOK-F |
@@ -139,12 +139,12 b' assumed branch name change.' | |||
|
139 | 139 | $ hg branch foo -q |
|
140 | 140 | |
|
141 | 141 | $ hg rebase -r '(A::)-(B::)-A' -d H --keepbranches |
|
142 |
rebasing 2:dc0947a82db8 "C" |
|
|
143 |
note: not rebasing 2:dc0947a82db8 "C" |
|
|
144 |
rebasing 3:b18e25de2cf5 "D" |
|
|
145 |
note: not rebasing 3:b18e25de2cf5 "D" |
|
|
146 |
rebasing 4:86a1f6686812 |
|
|
147 |
note: not rebasing 4:86a1f6686812 |
|
|
142 | rebasing 2:dc0947a82db8 BOOK-C "C" | |
|
143 | note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes | |
|
144 | rebasing 3:b18e25de2cf5 BOOK-D "D" | |
|
145 | note: not rebasing 3:b18e25de2cf5 BOOK-D "D", its destination already has all its changes | |
|
146 | rebasing 4:86a1f6686812 E BOOK-E "E" | |
|
147 | note: not rebasing 4:86a1f6686812 E BOOK-E "E", its destination already has all its changes | |
|
148 | 148 | saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg |
|
149 | 149 | $ hg update null -q |
|
150 | 150 | |
@@ -189,13 +189,13 b' Part of ancestors of a merge become empt' | |||
|
189 | 189 | > EOS |
|
190 | 190 | |
|
191 | 191 | $ hg rebase -r '(A::)-(B::)-A' -d H |
|
192 |
rebasing 2:dc0947a82db8 "C" |
|
|
193 |
note: not rebasing 2:dc0947a82db8 "C" |
|
|
194 |
rebasing 3:b18e25de2cf5 |
|
|
195 |
rebasing 4:03ca77807e91 |
|
|
196 |
rebasing 5:ad6717a6a58e "F" |
|
|
197 |
note: not rebasing 5:ad6717a6a58e "F" |
|
|
198 |
rebasing 6:c58e8bdac1f4 |
|
|
192 | rebasing 2:dc0947a82db8 BOOK-C "C" | |
|
193 | note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes | |
|
194 | rebasing 3:b18e25de2cf5 D BOOK-D "D" | |
|
195 | rebasing 4:03ca77807e91 E BOOK-E "E" | |
|
196 | rebasing 5:ad6717a6a58e BOOK-F "F" | |
|
197 | note: not rebasing 5:ad6717a6a58e BOOK-F "F", its destination already has all its changes | |
|
198 | rebasing 6:c58e8bdac1f4 G BOOK-G "G" | |
|
199 | 199 | saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg |
|
200 | 200 | |
|
201 | 201 | $ hg log -G -T '{rev} {desc} {bookmarks}' |
@@ -42,7 +42,7 b' Rebase a simple DAG:' | |||
|
42 | 42 | b (no-eol) |
|
43 | 43 | $ hg rebase --debug -r b -d c | grep rebasing |
|
44 | 44 | rebasing in memory |
|
45 |
rebasing 2:db0e82a16a62 "b" |
|
|
45 | rebasing 2:db0e82a16a62 b "b" | |
|
46 | 46 | $ hg tglog |
|
47 | 47 | o 3: ca58782ad1e4 'b' |
|
48 | 48 | | |
@@ -102,7 +102,7 b' Write files to the working copy, and ens' | |||
|
102 | 102 | somefile (no-eol) |
|
103 | 103 | $ hg rebase --debug -s b -d a | grep rebasing |
|
104 | 104 | rebasing in memory |
|
105 |
rebasing 2:db0e82a16a62 |
|
|
105 | rebasing 2:db0e82a16a62 b "b" | |
|
106 | 106 | $ hg tglog |
|
107 | 107 | o 3: fc055c3b4d33 'b' |
|
108 | 108 | | |
@@ -118,7 +118,7 b' Write files to the working copy, and ens' | |||
|
118 | 118 | b (no-eol) |
|
119 | 119 | $ hg rebase --debug -s 1 -d 3 | grep rebasing |
|
120 | 120 | rebasing in memory |
|
121 |
rebasing 1:02952614a83d |
|
|
121 | rebasing 1:02952614a83d d "d" | |
|
122 | 122 | rebasing 2:f56b71190a8f "c" |
|
123 | 123 | $ hg tglog |
|
124 | 124 | o 3: 753feb6fd12a 'c' |
@@ -149,7 +149,7 b' Rebase the working copy parent' | |||
|
149 | 149 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
150 | 150 | $ hg rebase -r 3 -d 0 --debug | grep rebasing |
|
151 | 151 | rebasing in memory |
|
152 |
rebasing 3:753feb6fd12a |
|
|
152 | rebasing 3:753feb6fd12a tip "c" | |
|
153 | 153 | $ hg tglog |
|
154 | 154 | @ 3: 844a7de3e617 'c' |
|
155 | 155 | | |
@@ -179,7 +179,7 b' Test reporting of path conflicts' | |||
|
179 | 179 | o 0: b173517d0057 'a' |
|
180 | 180 | |
|
181 | 181 | $ hg rebase -r . -d 2 |
|
182 |
rebasing 4:daf7dfc139cb "a/a" |
|
|
182 | rebasing 4:daf7dfc139cb tip "a/a" | |
|
183 | 183 | saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg |
|
184 | 184 | |
|
185 | 185 | $ hg tglog |
@@ -220,7 +220,7 b' Test reporting of path conflicts' | |||
|
220 | 220 | o 0: b173517d0057 'a' |
|
221 | 221 | |
|
222 | 222 | $ hg rebase -r . -d 5 |
|
223 |
rebasing 7:855e9797387e "added a back!" |
|
|
223 | rebasing 7:855e9797387e tip "added a back!" | |
|
224 | 224 | saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/855e9797387e-81ee4c5d-rebase.hg |
|
225 | 225 | |
|
226 | 226 | $ hg tglog |
@@ -246,7 +246,7 b' Test reporting of path conflicts' | |||
|
246 | 246 | $ hg ci -m 'c/subdir/file.txt' |
|
247 | 247 | $ hg rebase -r . -d 3 -n |
|
248 | 248 | starting dry-run rebase; repository will not be changed |
|
249 |
rebasing 8:e147e6e3c490 "c/subdir/file.txt" |
|
|
249 | rebasing 8:e147e6e3c490 tip "c/subdir/file.txt" | |
|
250 | 250 | abort: error: 'c/subdir/file.txt' conflicts with file 'c' in 3. |
|
251 | 251 | [255] |
|
252 | 252 | FIXME: shouldn't need this, but when we hit path conflicts in dryrun mode, we |
@@ -709,7 +709,7 b' Test a metadata-only in-memory merge' | |||
|
709 | 709 | $ hg ci -qAm 'add +x to foo.txt' |
|
710 | 710 | issue5960: this was raising an AttributeError exception |
|
711 | 711 | $ hg rebase -r . -d 1 |
|
712 |
rebasing 2:539b93e77479 "add +x to foo.txt" |
|
|
712 | rebasing 2:539b93e77479 tip "add +x to foo.txt" | |
|
713 | 713 | saved backup bundle to $TESTTMP/no_exception/.hg/strip-backup/*.hg (glob) |
|
714 | 714 | $ hg diff -c tip |
|
715 | 715 | diff --git a/foo.txt b/foo.txt |
@@ -772,7 +772,7 b' Test rebasing a commit with copy informa' | |||
|
772 | 772 | $ hg mv a b |
|
773 | 773 | $ hg ci -qm 'rename a to b' |
|
774 | 774 | $ hg rebase -d 1 |
|
775 |
rebasing 2:b977edf6f839 "rename a to b" |
|
|
775 | rebasing 2:b977edf6f839 tip "rename a to b" | |
|
776 | 776 | merging a and b to b |
|
777 | 777 | saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg |
|
778 | 778 | $ hg st --copies --change . |
@@ -793,7 +793,7 b' Test rebasing a commit with copy informa' | |||
|
793 | 793 | $ hg mv a b |
|
794 | 794 | $ hg ci -qm 'rename a to b' |
|
795 | 795 | $ hg rebase -d 1 |
|
796 |
rebasing 2:b977edf6f839 "rename a to b" |
|
|
796 | rebasing 2:b977edf6f839 tip "rename a to b" | |
|
797 | 797 | merging a and b to b |
|
798 | 798 | saved backup bundle to $TESTTMP/rebase-rename-empty/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg |
|
799 | 799 | $ hg st --copies --change . |
@@ -813,7 +813,7 b' Rebase across a copy with --collapse' | |||
|
813 | 813 | $ echo a2 > a |
|
814 | 814 | $ hg ci -qm 'modify a' |
|
815 | 815 | $ hg rebase -r . -d 1 --collapse |
|
816 |
rebasing 2:41c4ea50d4cf "modify a" |
|
|
816 | rebasing 2:41c4ea50d4cf tip "modify a" | |
|
817 | 817 | merging b and a to b |
|
818 | 818 | saved backup bundle to $TESTTMP/rebase-rename-collapse/.hg/strip-backup/41c4ea50d4cf-b90b7994-rebase.hg |
|
819 | 819 | $ cd .. |
@@ -850,7 +850,7 b' Test rebasing when the file we are mergi' | |||
|
850 | 850 | created new head |
|
851 | 851 | |
|
852 | 852 | $ hg rebase -r . -d 1 --config ui.merge=internal:merge3 |
|
853 |
rebasing 2:fb62b706688e "add b to foo" |
|
|
853 | rebasing 2:fb62b706688e tip "add b to foo" | |
|
854 | 854 | merging foo |
|
855 | 855 | hit merge conflicts; rebasing that commit again in the working copy |
|
856 | 856 | merging foo |
@@ -943,7 +943,7 b' definition.' | |||
|
943 | 943 | $ hg rebase -s 2 -d 3 |
|
944 | 944 | rebasing 2:0194f1db184a "b" |
|
945 | 945 | note: not rebasing 2:0194f1db184a "b", its destination already has all its changes |
|
946 |
rebasing 4:59c8292117b1 "merge" |
|
|
946 | rebasing 4:59c8292117b1 tip "merge" | |
|
947 | 947 | saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/0194f1db184a-aee31d03-rebase.hg |
|
948 | 948 | $ hg tglog |
|
949 | 949 | o 3: 506e2454484b 'merge' |
@@ -969,6 +969,6 b' changed although the file contents were ' | |||
|
969 | 969 | $ echo bar > test; hg add test; hg ci -m c |
|
970 | 970 | created new head |
|
971 | 971 | $ hg rebase -d 2 -d 1 --tool :local |
|
972 |
rebasing 2:ca2749322ee5 |
|
|
973 |
note: not rebasing 2:ca2749322ee5 |
|
|
972 | rebasing 2:ca2749322ee5 tip "c" | |
|
973 | note: not rebasing 2:ca2749322ee5 tip "c", its destination already has all its changes | |
|
974 | 974 | saved backup bundle to $TESTTMP/nofilechanges/.hg/strip-backup/ca2749322ee5-6dc7e94b-rebase.hg |
@@ -348,7 +348,7 b' two dirstate parents. We should not get ' | |||
|
348 | 348 | $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"' |
|
349 | 349 | rebasing 2:965c486023db "C" |
|
350 | 350 | M A |
|
351 |
rebasing 6:a0b2430ebfb8 "F" |
|
|
351 | rebasing 6:a0b2430ebfb8 tip "F" | |
|
352 | 352 | abort: precommit hook exited with status 1 |
|
353 | 353 | [255] |
|
354 | 354 | $ hg tglogp |
@@ -397,7 +397,7 b' two dirstate parents. We should not get ' | |||
|
397 | 397 | > --config 'hooks.tonative.pretxncommit=True' --config 'hooks.pretxncommit=hg log -r $HG_NODE | grep "summary: C"' |
|
398 | 398 | rebasing 2:965c486023db "C" |
|
399 | 399 | summary: C |
|
400 |
rebasing 6:a0b2430ebfb8 "F" |
|
|
400 | rebasing 6:a0b2430ebfb8 tip "F" | |
|
401 | 401 | transaction abort! |
|
402 | 402 | rollback completed |
|
403 | 403 | abort: pretxncommit hook exited with status 1 |
@@ -447,7 +447,7 b' two dirstate parents. We should not get ' | |||
|
447 | 447 | $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip | grep "summary: C"' |
|
448 | 448 | rebasing 2:965c486023db "C" |
|
449 | 449 | summary: C |
|
450 |
rebasing 6:a0b2430ebfb8 "F" |
|
|
450 | rebasing 6:a0b2430ebfb8 tip "F" | |
|
451 | 451 | transaction abort! |
|
452 | 452 | rollback completed |
|
453 | 453 | abort: pretxnclose hook exited with status 1 |
@@ -522,7 +522,7 b' Make sure merge state is cleaned up afte' | |||
|
522 | 522 | Now try again with --collapse |
|
523 | 523 | $ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
|
524 | 524 | $ hg rebase -s 2 -d 1 --noninteractive --collapse |
|
525 |
rebasing 2:fdaca8533b86 "b" |
|
|
525 | rebasing 2:fdaca8533b86 tip "b" | |
|
526 | 526 | merging a |
|
527 | 527 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
528 | 528 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -533,7 +533,7 b' Now try again with --collapse' | |||
|
533 | 533 | (no more unresolved files) |
|
534 | 534 | continue: hg rebase --continue |
|
535 | 535 | $ hg rebase --continue |
|
536 |
rebasing 2:fdaca8533b86 "b" |
|
|
536 | rebasing 2:fdaca8533b86 tip "b" | |
|
537 | 537 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
|
538 | 538 | $ hg resolve --list |
|
539 | 539 | $ test -d .hg/merge |
@@ -58,11 +58,11 b' rebasestate generated by a legacy client' | |||
|
58 | 58 | #endif |
|
59 | 59 | |
|
60 | 60 | $ hg continue |
|
61 |
rebasing 4:c1e6b162678d "B" |
|
|
62 |
rebasing 8:6f7a236de685 "D" |
|
|
63 |
rebasing 2:de008c61a447 "E" |
|
|
64 |
rebasing 7:d2fa1c02b240 "G" |
|
|
65 |
rebasing 9:6582e6951a9c "H" |
|
|
61 | rebasing 4:c1e6b162678d B "B" | |
|
62 | rebasing 8:6f7a236de685 D "D" | |
|
63 | rebasing 2:de008c61a447 E "E" | |
|
64 | rebasing 7:d2fa1c02b240 G "G" | |
|
65 | rebasing 9:6582e6951a9c H tip "H" | |
|
66 | 66 | warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447 |
|
67 | 67 | saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg |
|
68 | 68 |
@@ -57,7 +57,7 b' already has one local mq patch' | |||
|
57 | 57 | $ hg up -q -C qtip |
|
58 | 58 | |
|
59 | 59 | $ hg rebase -v |
|
60 |
rebasing 2:13a46ce44f60 |
|
|
60 | rebasing 2:13a46ce44f60 p0.patch qbase "P0" | |
|
61 | 61 | resolving manifests |
|
62 | 62 | removing p0 |
|
63 | 63 | getting r1 |
@@ -67,9 +67,9 b' already has one local mq patch' | |||
|
67 | 67 | p0 |
|
68 | 68 | committing manifest |
|
69 | 69 | committing changelog |
|
70 |
rebasing 3:148775c71080 |
|
|
70 | rebasing 3:148775c71080 p1.patch qtip "P1" | |
|
71 | 71 | resolving manifests |
|
72 |
note: not rebasing 3:148775c71080 |
|
|
72 | note: not rebasing 3:148775c71080 p1.patch qtip "P1", its destination already has all its changes | |
|
73 | 73 | rebase merging completed |
|
74 | 74 | updating mq patch p0.patch to 5:9ecc820b1737 |
|
75 | 75 | $TESTTMP/a/.hg/patches/p0.patch |
@@ -149,12 +149,12 b' already has one local mq patch' | |||
|
149 | 149 | $ hg up -q qtip |
|
150 | 150 | |
|
151 | 151 | $ HGMERGE=internal:fail hg rebase |
|
152 |
rebasing 1:b4bffa6e4776 |
|
|
153 |
note: not rebasing 1:b4bffa6e4776 |
|
|
154 |
rebasing 2:c0fd129beb01 "r2" |
|
|
155 |
rebasing 3:6ff5b8feed8e "r3" |
|
|
156 |
note: not rebasing 3:6ff5b8feed8e "r3" |
|
|
157 |
rebasing 4:094320fec554 "r4" |
|
|
152 | rebasing 1:b4bffa6e4776 qbase r1 "r1" | |
|
153 | note: not rebasing 1:b4bffa6e4776 qbase r1 "r1", its destination already has all its changes | |
|
154 | rebasing 2:c0fd129beb01 r2 "r2" | |
|
155 | rebasing 3:6ff5b8feed8e r3 "r3" | |
|
156 | note: not rebasing 3:6ff5b8feed8e r3 "r3", its destination already has all its changes | |
|
157 | rebasing 4:094320fec554 r4 "r4" | |
|
158 | 158 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
|
159 | 159 | [1] |
|
160 | 160 | |
@@ -163,14 +163,14 b' already has one local mq patch' | |||
|
163 | 163 | continue: hg rebase --continue |
|
164 | 164 | |
|
165 | 165 | $ hg continue |
|
166 |
already rebased 1:b4bffa6e4776 |
|
|
167 |
already rebased 2:c0fd129beb01 "r2" |
|
|
168 |
already rebased 3:6ff5b8feed8e "r3" |
|
|
169 |
rebasing 4:094320fec554 "r4" |
|
|
170 |
note: not rebasing 4:094320fec554 "r4" |
|
|
171 |
rebasing 5:681a378595ba "r5" |
|
|
172 |
rebasing 6:512a1f24768b |
|
|
173 |
note: not rebasing 6:512a1f24768b |
|
|
166 | already rebased 1:b4bffa6e4776 qbase r1 "r1" as 057f55ff8f44 | |
|
167 | already rebased 2:c0fd129beb01 r2 "r2" as 1660ab13ce9a | |
|
168 | already rebased 3:6ff5b8feed8e r3 "r3" as 1660ab13ce9a | |
|
169 | rebasing 4:094320fec554 r4 "r4" | |
|
170 | note: not rebasing 4:094320fec554 r4 "r4", its destination already has all its changes | |
|
171 | rebasing 5:681a378595ba r5 "r5" | |
|
172 | rebasing 6:512a1f24768b qtip r6 "r6" | |
|
173 | note: not rebasing 6:512a1f24768b qtip r6 "r6", its destination already has all its changes | |
|
174 | 174 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg |
|
175 | 175 | |
|
176 | 176 | $ hg tglog |
@@ -59,7 +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 |
|
|
62 | rebasing 2:3504f44bffc0 f.patch qbase "P0" | |
|
63 | 63 | merging f |
|
64 | 64 | warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
|
65 | 65 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -72,8 +72,8 b' Fix the 1st conflict:' | |||
|
72 | 72 | (no more unresolved files) |
|
73 | 73 | continue: hg rebase --continue |
|
74 | 74 | $ hg rebase -c |
|
75 |
rebasing 2:3504f44bffc0 |
|
|
76 |
rebasing 3:929394423cd3 |
|
|
75 | rebasing 2:3504f44bffc0 f.patch qbase "P0" | |
|
76 | rebasing 3:929394423cd3 f2.patch qtip tip "P1" | |
|
77 | 77 | merging f |
|
78 | 78 | warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
|
79 | 79 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -86,8 +86,8 b' Fix the 2nd conflict:' | |||
|
86 | 86 | (no more unresolved files) |
|
87 | 87 | continue: hg rebase --continue |
|
88 | 88 | $ hg rebase -c |
|
89 |
already rebased 2:3504f44bffc0 |
|
|
90 |
rebasing 3:929394423cd3 |
|
|
89 | already rebased 2:3504f44bffc0 f.patch qbase "P0" as ebe9914c0d1c | |
|
90 | rebasing 3:929394423cd3 f2.patch qtip "P1" | |
|
91 | 91 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg |
|
92 | 92 | |
|
93 | 93 | $ hg tglog |
@@ -203,8 +203,8 b' Adding one git-style patch and one norma' | |||
|
203 | 203 | Rebase the applied mq patches: |
|
204 | 204 | |
|
205 | 205 | $ hg rebase -s 2 -d 1 |
|
206 |
rebasing 2:0c587ffcb480 |
|
|
207 |
rebasing 3:c7f18665e4bc |
|
|
206 | rebasing 2:0c587ffcb480 f_git.patch qbase "P0 (git)" | |
|
207 | rebasing 3:c7f18665e4bc f.patch qtip tip "P1" | |
|
208 | 208 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-rebase.hg |
|
209 | 209 | |
|
210 | 210 | $ hg qci -m 'save patch state' |
@@ -337,7 +337,7 b' removed from the series):' | |||
|
337 | 337 | foo |
|
338 | 338 | $ [ -f .hg/patches/empty-important ] |
|
339 | 339 | $ hg -q rebase -d 2 |
|
340 |
note: not rebasing 1:0aaf4c3af7eb |
|
|
340 | note: not rebasing 1:0aaf4c3af7eb empty-important qbase "important commit message", its destination already has all its changes | |
|
341 | 341 | $ hg qseries |
|
342 | 342 | guarded |
|
343 | 343 | bar |
@@ -72,7 +72,7 b' Branch name containing a dash (issue3181' | |||
|
72 | 72 | rebasing 5:24b6387c8c8c "F" |
|
73 | 73 | rebasing 6:eea13746799a "G" |
|
74 | 74 | rebasing 7:02de42196ebe "H" |
|
75 |
rebasing 9:cb039b7cae8e "dev-two named branch" |
|
|
75 | rebasing 9:cb039b7cae8e tip "dev-two named branch" | |
|
76 | 76 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg |
|
77 | 77 | |
|
78 | 78 | $ hg tglog |
@@ -101,7 +101,7 b' Branch name containing a dash (issue3181' | |||
|
101 | 101 | rebasing 6:24de4aff8e28 "F" |
|
102 | 102 | rebasing 7:4b988a958030 "G" |
|
103 | 103 | rebasing 8:31d0e4ba75e6 "H" |
|
104 |
rebasing 9:9e70cd31750f "dev-two named branch" |
|
|
104 | rebasing 9:9e70cd31750f tip "dev-two named branch" | |
|
105 | 105 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg |
|
106 | 106 | |
|
107 | 107 | $ hg tglog |
@@ -190,7 +190,7 b' Branch name containing a dash (issue3181' | |||
|
190 | 190 | rebasing 6:679f28760620 "F" |
|
191 | 191 | rebasing 7:549f007a9f5f "G" |
|
192 | 192 | rebasing 8:12b2bc666e20 "H" |
|
193 |
rebasing 9:71325f8bc082 "dev-two named branch" |
|
|
193 | rebasing 9:71325f8bc082 tip "dev-two named branch" | |
|
194 | 194 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg |
|
195 | 195 | |
|
196 | 196 | $ hg tglog |
@@ -253,7 +253,7 b' Rebasing descendant onto ancestor across' | |||
|
253 | 253 | rebasing 6:3944801ae4ea "dev-two named branch" |
|
254 | 254 | rebasing 7:3bdb949809d9 "B" |
|
255 | 255 | rebasing 8:a0d543090fa4 "C" |
|
256 |
rebasing 9:e9f862ce8bad "D" |
|
|
256 | rebasing 9:e9f862ce8bad tip "D" | |
|
257 | 257 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg |
|
258 | 258 | |
|
259 | 259 | $ hg tglog |
@@ -344,7 +344,7 b' source or destination.' | |||
|
344 | 344 | |
|
345 | 345 | $ hg rebase -s tip -d 4 --dry-run |
|
346 | 346 | starting dry-run rebase; repository will not be changed |
|
347 |
rebasing 11:be1dea60f2a6 |
|
|
347 | rebasing 11:be1dea60f2a6 tip "D" | |
|
348 | 348 | dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase |
|
349 | 349 | $ hg diff |
|
350 | 350 | diff -r 2b586e70108d A |
@@ -360,7 +360,7 b' unrelated to the source or destination.' | |||
|
360 | 360 | $ echo A-mod > A |
|
361 | 361 | $ echo n | hg rebase -s tip -d 4 --confirm --config ui.interactive=True |
|
362 | 362 | starting in-memory rebase |
|
363 |
rebasing 11:be1dea60f2a6 "D" |
|
|
363 | rebasing 11:be1dea60f2a6 tip "D" | |
|
364 | 364 | rebase completed successfully |
|
365 | 365 | apply changes (yn)? n |
|
366 | 366 | $ hg diff |
@@ -374,7 +374,7 b' unrelated to the source or destination.' | |||
|
374 | 374 | $ echo A-mod > A |
|
375 | 375 | $ hg rebase -s tip -d 4 --confirm |
|
376 | 376 | starting in-memory rebase |
|
377 |
rebasing 11:be1dea60f2a6 "D" |
|
|
377 | rebasing 11:be1dea60f2a6 tip "D" | |
|
378 | 378 | rebase completed successfully |
|
379 | 379 | apply changes (yn)? y |
|
380 | 380 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/be1dea60f2a6-ca6d2dac-rebase.hg |
@@ -527,8 +527,8 b" rebase 'c1' to the branch head 'c2' that" | |||
|
527 | 527 | marked working directory as branch x |
|
528 | 528 | $ hg rebase -r 3:: -d . |
|
529 | 529 | rebasing 3:76abc1c6f8c7 "b1" |
|
530 |
rebasing 4:8427af5d86f2 "c2 closed" |
|
|
531 |
note: not rebasing 4:8427af5d86f2 "c2 closed" |
|
|
530 | rebasing 4:8427af5d86f2 tip "c2 closed" | |
|
531 | note: not rebasing 4:8427af5d86f2 tip "c2 closed", its destination already has all its changes | |
|
532 | 532 | saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg |
|
533 | 533 | $ hg tglog |
|
534 | 534 | o 3: 117b0ed08075 'b1' x |
@@ -251,7 +251,7 b' rebase of merge of ancestors' | |||
|
251 | 251 | $ echo 'other change while merging future "rebase ancestors"' > other |
|
252 | 252 | $ hg ci -Aqm 'merge rebase ancestors' |
|
253 | 253 | $ hg rebase -d 5 -v |
|
254 |
rebasing 6:4c5f12f25ebe "merge rebase ancestors" |
|
|
254 | rebasing 6:4c5f12f25ebe tip "merge rebase ancestors" | |
|
255 | 255 | resolving manifests |
|
256 | 256 | removing other |
|
257 | 257 | resolving manifests |
@@ -310,9 +310,9 b' may include unwanted content:' | |||
|
310 | 310 | > R |
|
311 | 311 | > EOS |
|
312 | 312 | $ hg rebase -r D+E+F -d Z |
|
313 |
rebasing 5:5f2c926dfecf "D" |
|
|
314 |
rebasing 6:b296604d9846 "E" |
|
|
315 |
rebasing 7:caa9781e507d "F" |
|
|
313 | rebasing 5:5f2c926dfecf D "D" | |
|
314 | rebasing 6:b296604d9846 E "E" | |
|
315 | rebasing 7:caa9781e507d F tip "F" | |
|
316 | 316 | abort: rebasing 7:caa9781e507d will include unwanted changes from 4:d6003a550c2c or 3:c1e6b162678d |
|
317 | 317 | [255] |
|
318 | 318 | |
@@ -330,9 +330,9 b' The warning does not get printed if ther' | |||
|
330 | 330 | > R |
|
331 | 331 | > EOS |
|
332 | 332 | $ hg rebase -r B+C+D -d Z |
|
333 |
rebasing 3:c1e6b162678d "B" |
|
|
334 |
rebasing 4:d6003a550c2c "C" |
|
|
335 |
rebasing 5:c8f78076273e "D" |
|
|
333 | rebasing 3:c1e6b162678d B "B" | |
|
334 | rebasing 4:d6003a550c2c C "C" | |
|
335 | rebasing 5:c8f78076273e D tip "D" | |
|
336 | 336 | saved backup bundle to $TESTTMP/dual-merge-base2/.hg/strip-backup/d6003a550c2c-6f1424b6-rebase.hg |
|
337 | 337 | $ hg manifest -r 'desc(D)' |
|
338 | 338 | B |
@@ -352,8 +352,8 b' The merge base could be different from o' | |||
|
352 | 352 | > B C Z |
|
353 | 353 | > EOS |
|
354 | 354 | $ hg rebase -r D+F -d Z |
|
355 |
rebasing 3:004dc1679908 "D" |
|
|
356 |
rebasing 5:4be4cbf6f206 "F" |
|
|
355 | rebasing 3:004dc1679908 D "D" | |
|
356 | rebasing 5:4be4cbf6f206 F tip "F" | |
|
357 | 357 | saved backup bundle to $TESTTMP/chosen-merge-base1/.hg/strip-backup/004dc1679908-06a66a3c-rebase.hg |
|
358 | 358 | $ hg manifest -r 'desc(F)' |
|
359 | 359 | C |
@@ -373,8 +373,8 b' The merge base could be different from o' | |||
|
373 | 373 | > B C Z |
|
374 | 374 | > EOS |
|
375 | 375 | $ hg rebase -r E+F -d Z |
|
376 |
rebasing 4:974e4943c210 "E" |
|
|
377 |
rebasing 5:4be4cbf6f206 "F" |
|
|
376 | rebasing 4:974e4943c210 E "E" | |
|
377 | rebasing 5:4be4cbf6f206 F tip "F" | |
|
378 | 378 | saved backup bundle to $TESTTMP/chosen-merge-base2/.hg/strip-backup/974e4943c210-b2874da5-rebase.hg |
|
379 | 379 | $ hg manifest -r 'desc(F)' |
|
380 | 380 | B |
@@ -210,7 +210,7 b' More complex case where part of the reba' | |||
|
210 | 210 | |
|
211 | 211 | $ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True |
|
212 | 212 | rebasing 8:8877864f1edb "B" |
|
213 |
note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D" |
|
|
213 | note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 tip "D" | |
|
214 | 214 | rebasing 10:5ae4c968c6ac "C" |
|
215 | 215 | $ hg debugobsolete |
|
216 | 216 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} |
@@ -258,7 +258,7 b' More complex case where part of the reba' | |||
|
258 | 258 | grafting 11:4596109a6a43 "D" |
|
259 | 259 | $ hg up -qr 'desc(E)' |
|
260 | 260 | $ hg rebase -s tip -d . |
|
261 |
rebasing 14:9e36056a46e3 "D" |
|
|
261 | rebasing 14:9e36056a46e3 tip "D" | |
|
262 | 262 | $ hg log --style default --debug -r tip |
|
263 | 263 | changeset: 15:627d4614809036ba22b9e7cb31638ddc06ab99ab |
|
264 | 264 | tag: tip |
@@ -518,7 +518,7 b' Test multiple root handling' | |||
|
518 | 518 | $ hg rebase --dest 4 --rev '7+11+9' |
|
519 | 519 | rebasing 9:cf44d2f5a9f4 "D" |
|
520 | 520 | rebasing 7:02de42196ebe "H" |
|
521 |
rebasing 11:0d8f238b634c "C" |
|
|
521 | rebasing 11:0d8f238b634c tip "C" | |
|
522 | 522 | $ hg log -G |
|
523 | 523 | o 14:1e8370e38cca C |
|
524 | 524 | | |
@@ -556,9 +556,9 b' Detach both parents' | |||
|
556 | 556 | > EOF |
|
557 | 557 | |
|
558 | 558 | $ hg rebase -d G -r 'B + D + F' |
|
559 |
rebasing 1:112478962961 "B" |
|
|
560 |
rebasing 2:b18e25de2cf5 "D" |
|
|
561 |
rebasing 6:f15c3adaf214 "F" |
|
|
559 | rebasing 1:112478962961 B "B" | |
|
560 | rebasing 2:b18e25de2cf5 D "D" | |
|
561 | rebasing 6:f15c3adaf214 F tip "F" | |
|
562 | 562 | abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents |
|
563 | 563 | [255] |
|
564 | 564 | |
@@ -612,7 +612,7 b' test on rebase dropping a merge' | |||
|
612 | 612 | $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)' |
|
613 | 613 | rebasing 3:32af7686d403 "D" |
|
614 | 614 | rebasing 7:02de42196ebe "H" |
|
615 |
rebasing 9:4bde274eefcf |
|
|
615 | rebasing 9:4bde274eefcf tip "I" | |
|
616 | 616 | 1 new orphan changesets |
|
617 | 617 | $ hg log -G |
|
618 | 618 | @ 12:acd174b7ab39 I |
@@ -656,7 +656,7 b' Test hidden changesets in the rebase set' | |||
|
656 | 656 | |
|
657 | 657 | $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off |
|
658 | 658 | rebasing 9:4bde274eefcf "I" |
|
659 |
rebasing 13:06edfc82198f |
|
|
659 | rebasing 13:06edfc82198f tip "J" | |
|
660 | 660 | 2 new content-divergent changesets |
|
661 | 661 | $ hg log -G |
|
662 | 662 | @ 15:5ae8a643467b J |
@@ -787,7 +787,7 b' Rebase finds its way in a chain of marke' | |||
|
787 | 787 | |
|
788 | 788 | $ hg rebase -d 'desc(B2)' |
|
789 | 789 | note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2" |
|
790 |
rebasing 4:212cb178bcbb |
|
|
790 | rebasing 4:212cb178bcbb tip "C" | |
|
791 | 791 | |
|
792 | 792 | Even when the chain include missing node |
|
793 | 793 | |
@@ -816,7 +816,7 b' Even when the chain include missing node' | |||
|
816 | 816 | |
|
817 | 817 | $ hg rebase -d 'desc(B2)' |
|
818 | 818 | note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 2:261e70097290 "B2" |
|
819 |
rebasing 5:1a79b7535141 |
|
|
819 | rebasing 5:1a79b7535141 tip "D" | |
|
820 | 820 | $ hg up 4 |
|
821 | 821 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
822 | 822 | $ echo "O" > O |
@@ -845,7 +845,7 b' Even when the chain include missing node' | |||
|
845 | 845 | $ hg rebase -d 6 -r "4::" |
|
846 | 846 | rebasing 4:ff2c4d47b71d "C" |
|
847 | 847 | note: not rebasing 7:360bbaa7d3ce "O", it has no successor |
|
848 |
rebasing 8:8d47583e023f |
|
|
848 | rebasing 8:8d47583e023f tip "P" | |
|
849 | 849 | |
|
850 | 850 | If all the changeset to be rebased are obsolete and present in the destination, we |
|
851 | 851 | should display a friendly error message |
@@ -885,7 +885,7 b' should display a friendly error message' | |||
|
885 | 885 | o 0:4a2df7238c3b A |
|
886 | 886 | |
|
887 | 887 | $ hg rebase -r . -d 10 |
|
888 |
note: not rebasing 11:f44da1f4954c "nonrelevant" |
|
|
888 | note: not rebasing 11:f44da1f4954c tip "nonrelevant", it has no successor | |
|
889 | 889 | |
|
890 | 890 | If a rebase is going to create divergence, it should abort |
|
891 | 891 | |
@@ -970,7 +970,7 b' With experimental.evolution.allowdiverge' | |||
|
970 | 970 | |
|
971 | 971 | $ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True |
|
972 | 972 | rebasing 10:121d9e3bc4c6 "P" |
|
973 |
rebasing 14:73568ab6879d "bar foo" |
|
|
973 | rebasing 14:73568ab6879d tip "bar foo" | |
|
974 | 974 | 2 new content-divergent changesets |
|
975 | 975 | $ hg summary |
|
976 | 976 | parent: 16:61bd55f69bc4 tip |
@@ -1041,7 +1041,7 b' Create the changes that we will rebase' | |||
|
1041 | 1041 | $ hg rebase --continue |
|
1042 | 1042 | rebasing 19:b82fb57ea638 "willconflict second version" |
|
1043 | 1043 | note: not rebasing 20:8b31da3c4919 "dummy change", already in destination as 18:601db7a18f51 "dummy change successor" |
|
1044 |
rebasing 21:7bdc8a87673d "dummy change" |
|
|
1044 | rebasing 21:7bdc8a87673d tip "dummy change" | |
|
1045 | 1045 | $ cd .. |
|
1046 | 1046 | |
|
1047 | 1047 | Divergence cases due to obsolete changesets |
@@ -1096,11 +1096,11 b' would occur because the successor of d (' | |||
|
1096 | 1096 | consequence f (descendant of d) is left behind. |
|
1097 | 1097 | |
|
1098 | 1098 | $ hg rebase -b 'e' -d 'x' |
|
1099 |
rebasing 1:488e1b7e7341 "b" |
|
|
1100 |
rebasing 3:a82ac2b38757 "c" |
|
|
1101 |
rebasing 5:027ad6c5830d |
|
|
1102 |
rebasing 6:d60ebfa0f1cb |
|
|
1103 |
note: not rebasing 4:76be324c128b |
|
|
1099 | rebasing 1:488e1b7e7341 b "b" | |
|
1100 | rebasing 3:a82ac2b38757 c "c" | |
|
1101 | rebasing 5:027ad6c5830d d' "d'" | |
|
1102 | rebasing 6:d60ebfa0f1cb e "e" | |
|
1103 | note: not rebasing 4:76be324c128b d "d" and its descendants as this would cause divergence | |
|
1104 | 1104 | $ hg log -G -r 'a':: |
|
1105 | 1105 | o 11:eb6d63fc4ed5 e |
|
1106 | 1106 | | |
@@ -1154,9 +1154,9 b' By allowing divergence, we can perform t' | |||
|
1154 | 1154 | (to force the rebase please set experimental.evolution.allowdivergence=True) |
|
1155 | 1155 | [255] |
|
1156 | 1156 | $ hg rebase --config experimental.evolution.allowdivergence=true -r 'c'::'f' -d 'x' |
|
1157 |
rebasing 3:a82ac2b38757 |
|
|
1158 |
rebasing 4:76be324c128b |
|
|
1159 |
rebasing 7:1143e9adc121 |
|
|
1157 | rebasing 3:a82ac2b38757 c "c" | |
|
1158 | rebasing 4:76be324c128b d "d" | |
|
1159 | rebasing 7:1143e9adc121 f tip "f" | |
|
1160 | 1160 | 1 new orphan changesets |
|
1161 | 1161 | 2 new content-divergent changesets |
|
1162 | 1162 | $ hg log -G -r 'a':: -T instabilities |
@@ -1187,9 +1187,9 b' By allowing divergence, we can perform t' | |||
|
1187 | 1187 | (Not skipping obsoletes means that divergence is allowed.) |
|
1188 | 1188 | |
|
1189 | 1189 | $ hg rebase --config experimental.rebaseskipobsolete=false -r 'c'::'f' -d 'x' |
|
1190 |
|
|
|
1191 |
|
|
|
1192 |
|
|
|
1190 | rebasing 3:a82ac2b38757 c "c" | |
|
1191 | rebasing 4:76be324c128b d "d" | |
|
1192 | rebasing 7:1143e9adc121 f tip "f" | |
|
1193 | 1193 | 1 new orphan changesets |
|
1194 | 1194 | 2 new content-divergent changesets |
|
1195 | 1195 | |
@@ -1231,12 +1231,12 b' Similar test on a more complex graph' | |||
|
1231 | 1231 | o 0:b173517d0057 a |
|
1232 | 1232 | |
|
1233 | 1233 | $ hg rebase -b 'f' -d 'x' |
|
1234 |
rebasing 1:488e1b7e7341 |
|
|
1235 |
rebasing 3:a82ac2b38757 |
|
|
1236 |
rebasing 5:63324dc512ea |
|
|
1237 |
rebasing 7:3ffec603ab53 " |
|
|
1238 |
rebasing 4:76be324c128b " |
|
|
1239 |
note: not rebasing 6:e36fae928aec |
|
|
1234 | rebasing 1:488e1b7e7341 b "b" | |
|
1235 | rebasing 3:a82ac2b38757 c "c" | |
|
1236 | rebasing 5:63324dc512ea e' "e'" | |
|
1237 | rebasing 7:3ffec603ab53 f "f" | |
|
1238 | rebasing 4:76be324c128b d "d" | |
|
1239 | note: not rebasing 6:e36fae928aec e "e" and its descendants as this would cause divergence | |
|
1240 | 1240 | $ hg log -G -r 'a': |
|
1241 | 1241 | o 13:a1707a5b7c2c d |
|
1242 | 1242 | | |
@@ -1294,7 +1294,7 b' issue5782' | |||
|
1294 | 1294 | o 0:b173517d0057 a |
|
1295 | 1295 | |
|
1296 | 1296 | $ hg rebase -d 0 -r 2 |
|
1297 |
rebasing 2:a82ac2b38757 "c" |
|
|
1297 | rebasing 2:a82ac2b38757 c "c" | |
|
1298 | 1298 | $ hg log -G -r 'a': --hidden |
|
1299 | 1299 | o 5:69ad416a4a26 c |
|
1300 | 1300 | | |
@@ -1325,8 +1325,8 b' Rebase merge where successor of one pare' | |||
|
1325 | 1325 | 1 new orphan changesets |
|
1326 | 1326 | |
|
1327 | 1327 | $ hg rebase -d B -s D |
|
1328 |
note: not rebasing 2:b18e25de2cf5 "D" |
|
|
1329 |
rebasing 4:66f1a38021c9 |
|
|
1328 | note: not rebasing 2:b18e25de2cf5 D "D", already in destination as 1:112478962961 B "B" | |
|
1329 | rebasing 4:66f1a38021c9 F tip "F" | |
|
1330 | 1330 |
|
|
1331 | 1331 | o 5:50e9d60b99c6 F |
|
1332 | 1332 | |\ |
@@ -1357,8 +1357,8 b' Rebase merge where successor of other pa' | |||
|
1357 | 1357 | 1 new orphan changesets |
|
1358 | 1358 | |
|
1359 | 1359 | $ hg rebase -d B -s E |
|
1360 |
note: not rebasing 3:7fb047a69f22 "E" |
|
|
1361 |
rebasing 4:66f1a38021c9 |
|
|
1360 | note: not rebasing 3:7fb047a69f22 E "E", already in destination as 1:112478962961 B "B" | |
|
1361 | rebasing 4:66f1a38021c9 F tip "F" | |
|
1362 | 1362 |
|
|
1363 | 1363 | o 5:aae1787dacee F |
|
1364 | 1364 | |\ |
@@ -1389,8 +1389,8 b' Rebase merge where successor of one pare' | |||
|
1389 | 1389 | 1 new orphan changesets |
|
1390 | 1390 | |
|
1391 | 1391 | $ hg rebase -d C -s D |
|
1392 |
note: not rebasing 2:b18e25de2cf5 "D" |
|
|
1393 |
rebasing 5:66f1a38021c9 |
|
|
1392 | note: not rebasing 2:b18e25de2cf5 D "D", already in destination as 1:112478962961 B "B" | |
|
1393 | rebasing 5:66f1a38021c9 F tip "F" | |
|
1394 | 1394 | |
|
1395 | 1395 |
|
|
1396 | 1396 | o 6:0913febf6439 F |
@@ -1424,8 +1424,8 b' Rebase merge where successor of other pa' | |||
|
1424 | 1424 | 1 new orphan changesets |
|
1425 | 1425 | |
|
1426 | 1426 | $ hg rebase -d C -s E |
|
1427 |
note: not rebasing 3:7fb047a69f22 "E" |
|
|
1428 |
rebasing 5:66f1a38021c9 |
|
|
1427 | note: not rebasing 3:7fb047a69f22 E "E", already in destination as 1:112478962961 B "B" | |
|
1428 | rebasing 5:66f1a38021c9 F tip "F" | |
|
1429 | 1429 |
|
|
1430 | 1430 | o 6:c6ab0cc6d220 F |
|
1431 | 1431 | |\ |
@@ -1458,10 +1458,10 b' Rebase merge where successor of one pare' | |||
|
1458 | 1458 | 1 new orphan changesets |
|
1459 | 1459 | |
|
1460 | 1460 | $ hg rebase -d C -b F |
|
1461 |
rebasing 2:b18e25de2cf5 "D" |
|
|
1462 |
note: not rebasing 3:7fb047a69f22 "E" |
|
|
1463 |
rebasing 5:66f1a38021c9 |
|
|
1464 |
note: not rebasing 5:66f1a38021c9 |
|
|
1461 | rebasing 2:b18e25de2cf5 D "D" | |
|
1462 | note: not rebasing 3:7fb047a69f22 E "E", already in destination as 1:112478962961 B "B" | |
|
1463 | rebasing 5:66f1a38021c9 F tip "F" | |
|
1464 | note: not rebasing 5:66f1a38021c9 F tip "F", its destination already has all its changes | |
|
1465 | 1465 | $ hg log -G |
|
1466 | 1466 | o 6:8f47515dda15 D |
|
1467 | 1467 | | |
@@ -1494,10 +1494,10 b' Rebase merge where successor of other pa' | |||
|
1494 | 1494 | 1 new orphan changesets |
|
1495 | 1495 | |
|
1496 | 1496 | $ hg rebase -d C -b F |
|
1497 |
note: not rebasing 2:b18e25de2cf5 "D" |
|
|
1498 |
rebasing 3:7fb047a69f22 "E" |
|
|
1499 |
rebasing 5:66f1a38021c9 |
|
|
1500 |
note: not rebasing 5:66f1a38021c9 |
|
|
1497 | note: not rebasing 2:b18e25de2cf5 D "D", already in destination as 1:112478962961 B "B" | |
|
1498 | rebasing 3:7fb047a69f22 E "E" | |
|
1499 | rebasing 5:66f1a38021c9 F tip "F" | |
|
1500 | note: not rebasing 5:66f1a38021c9 F tip "F", its destination already has all its changes | |
|
1501 | 1501 | |
|
1502 | 1502 | $ hg log -G |
|
1503 | 1503 | o 6:533690786a86 E |
@@ -1531,8 +1531,8 b' destination' | |||
|
1531 | 1531 | > EOF |
|
1532 | 1532 | |
|
1533 | 1533 | $ hg rebase -d D -s B |
|
1534 |
rebasing 1:112478962961 "B" |
|
|
1535 |
note: not rebasing 3:26805aba1e60 "C" |
|
|
1534 | rebasing 1:112478962961 B "B" | |
|
1535 | note: not rebasing 3:26805aba1e60 C "C" and its descendants as this would cause divergence | |
|
1536 | 1536 | |
|
1537 | 1537 | $ cd .. |
|
1538 | 1538 | |
@@ -1581,9 +1581,9 b' Rebase merge where both parents have suc' | |||
|
1581 | 1581 | > EOS |
|
1582 | 1582 | 1 new orphan changesets |
|
1583 | 1583 | $ hg rebase -r A+B+E -d F |
|
1584 |
note: not rebasing 4:a3d17304151f "A" |
|
|
1585 |
note: not rebasing 5:b23a2cc00842 "B" |
|
|
1586 |
rebasing 7:dac5d11c5a7d |
|
|
1584 | note: not rebasing 4:a3d17304151f A "A", already in destination as 0:96cc3511f894 C "C" | |
|
1585 | note: not rebasing 5:b23a2cc00842 B "B", already in destination as 1:058c1e1fb10a D "D" | |
|
1586 | rebasing 7:dac5d11c5a7d E tip "E" | |
|
1587 | 1587 | abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f |
|
1588 | 1588 | [255] |
|
1589 | 1589 | $ cd .. |
@@ -1600,9 +1600,9 b' parent moves as requested.' | |||
|
1600 | 1600 | > EOS |
|
1601 | 1601 | 1 new orphan changesets |
|
1602 | 1602 | $ hg rebase -r A+B+D -d Z |
|
1603 |
note: not rebasing 0:426bada5c675 "A" |
|
|
1604 |
rebasing 1:fc2b737bb2e5 "B" |
|
|
1605 |
rebasing 3:b8ed089c80ad "D" |
|
|
1603 | note: not rebasing 0:426bada5c675 A "A", already in destination as 2:96cc3511f894 C "C" | |
|
1604 | rebasing 1:fc2b737bb2e5 B "B" | |
|
1605 | rebasing 3:b8ed089c80ad D "D" | |
|
1606 | 1606 | |
|
1607 | 1607 | $ rm .hg/localtags |
|
1608 | 1608 | $ hg log -G |
@@ -1631,9 +1631,9 b' parent moves as requested.' | |||
|
1631 | 1631 | > EOS |
|
1632 | 1632 | 1 new orphan changesets |
|
1633 | 1633 | $ hg rebase -r B+A+D -d Z |
|
1634 |
rebasing 0:426bada5c675 "A" |
|
|
1635 |
note: not rebasing 1:fc2b737bb2e5 "B" |
|
|
1636 |
rebasing 3:b8ed089c80ad "D" |
|
|
1634 | rebasing 0:426bada5c675 A "A" | |
|
1635 | note: not rebasing 1:fc2b737bb2e5 B "B", already in destination as 2:96cc3511f894 C "C" | |
|
1636 | rebasing 3:b8ed089c80ad D "D" | |
|
1637 | 1637 | |
|
1638 | 1638 | $ rm .hg/localtags |
|
1639 | 1639 | $ hg log -G |
@@ -1669,7 +1669,7 b' equivalents in destination' | |||
|
1669 | 1669 | adding b |
|
1670 | 1670 | created new head |
|
1671 | 1671 | $ hg rebase -r 2 -d 1 |
|
1672 |
rebasing 2:1e9a3c00cbe9 "b" |
|
|
1672 | rebasing 2:1e9a3c00cbe9 tip "b" | |
|
1673 | 1673 | $ hg log -r . # working dir is at rev 3 (successor of 2) |
|
1674 | 1674 | 3:be1832deae9a b (no-eol) |
|
1675 | 1675 | $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now |
@@ -1679,7 +1679,7 b' equivalents in destination' | |||
|
1679 | 1679 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1680 | 1680 | 2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol) |
|
1681 | 1681 | $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 |
|
1682 |
note: not rebasing 2:1e9a3c00cbe9 "b" |
|
|
1682 | note: not rebasing 2:1e9a3c00cbe9 mybook "b", already in destination as 3:be1832deae9a tip "b" | |
|
1683 | 1683 | Check that working directory and bookmark was updated to rev 3 although rev 2 |
|
1684 | 1684 | was skipped |
|
1685 | 1685 | $ hg log -r . |
@@ -1706,8 +1706,8 b' parent gets moved:' | |||
|
1706 | 1706 | $ hg update D1 -q |
|
1707 | 1707 | $ hg bookmark book -i |
|
1708 | 1708 | $ hg rebase -r B+D1 -d E |
|
1709 |
rebasing 1:112478962961 "B" |
|
|
1710 |
note: not rebasing 5:15ecf15e0114 |
|
|
1709 | rebasing 1:112478962961 B "B" | |
|
1710 | note: not rebasing 5:15ecf15e0114 D1 tip book "D1", already in destination as 2:0807738e0be9 D2 "D2" | |
|
1711 | 1711 | 1 new orphan changesets |
|
1712 | 1712 | $ hg log -G -T '{desc} {bookmarks}' |
|
1713 | 1713 | @ B book |
@@ -1819,7 +1819,7 b' Also test --continue for the above case' | |||
|
1819 | 1819 | continue: hg rebase --continue |
|
1820 | 1820 | $ hg rebase --continue |
|
1821 | 1821 | rebasing 1:2ec65233581b "B" |
|
1822 |
rebasing 3:7829726be4dc "C" |
|
|
1822 | rebasing 3:7829726be4dc tip "C" | |
|
1823 | 1823 | $ hg log -G |
|
1824 | 1824 | @ 5:1964d5d5b547 C |
|
1825 | 1825 | | |
@@ -2112,9 +2112,9 b' Test --stop moves bookmarks of original ' | |||
|
2112 | 2112 | o 0: 1994f17a630e 'A' bookmarks: |
|
2113 | 2113 | |
|
2114 | 2114 | $ hg rebase -s 1 -d 5 |
|
2115 |
rebasing 1:6c81ed0049f8 "B" |
|
|
2116 |
rebasing 2:49cb3485fa0c "C" |
|
|
2117 |
rebasing 3:67a385d4e6f2 "D" |
|
|
2115 | rebasing 1:6c81ed0049f8 X "B" | |
|
2116 | rebasing 2:49cb3485fa0c Y "C" | |
|
2117 | rebasing 3:67a385d4e6f2 Z "D" | |
|
2118 | 2118 | merging d |
|
2119 | 2119 | warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
|
2120 | 2120 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -451,8 +451,8 b' Test --tool parameter:' | |||
|
451 | 451 | $ cd b1 |
|
452 | 452 | |
|
453 | 453 | $ hg rebase -s 2 -d 1 --tool internal:local |
|
454 |
rebasing 2:e4e3f3546619 "c2b" |
|
|
455 |
note: not rebasing 2:e4e3f3546619 "c2b" |
|
|
454 | rebasing 2:e4e3f3546619 tip "c2b" | |
|
455 | note: not rebasing 2:e4e3f3546619 tip "c2b", its destination already has all its changes | |
|
456 | 456 | saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg |
|
457 | 457 | |
|
458 | 458 | $ hg cat c2 |
@@ -465,7 +465,7 b' Test --tool parameter:' | |||
|
465 | 465 | $ cd b2 |
|
466 | 466 | |
|
467 | 467 | $ hg rebase -s 2 -d 1 --tool internal:other |
|
468 |
rebasing 2:e4e3f3546619 "c2b" |
|
|
468 | rebasing 2:e4e3f3546619 tip "c2b" | |
|
469 | 469 | saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg |
|
470 | 470 | |
|
471 | 471 | $ hg cat c2 |
@@ -478,7 +478,7 b' Test --tool parameter:' | |||
|
478 | 478 | $ cd b3 |
|
479 | 479 | |
|
480 | 480 | $ hg rebase -s 2 -d 1 --tool internal:fail |
|
481 |
rebasing 2:e4e3f3546619 "c2b" |
|
|
481 | rebasing 2:e4e3f3546619 tip "c2b" | |
|
482 | 482 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
|
483 | 483 | [1] |
|
484 | 484 | |
@@ -502,8 +502,8 b' Test --tool parameter:' | |||
|
502 | 502 | (continue: hg rebase --continue) |
|
503 | 503 | [255] |
|
504 | 504 | $ hg rebase -c --tool internal:fail |
|
505 |
rebasing 2:e4e3f3546619 "c2b" |
|
|
506 |
note: not rebasing 2:e4e3f3546619 "c2b" |
|
|
505 | rebasing 2:e4e3f3546619 tip "c2b" | |
|
506 | note: not rebasing 2:e4e3f3546619 tip "c2b", its destination already has all its changes | |
|
507 | 507 | saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg |
|
508 | 508 | |
|
509 | 509 | $ hg rebase -i |
@@ -35,8 +35,8 b' Rebase two commits, of which one is alre' | |||
|
35 | 35 | > |/ |
|
36 | 36 | > A |
|
37 | 37 | > EOF |
|
38 |
rebasing 2:b18e25de2cf5 "D" |
|
|
39 |
already rebased 3:26805aba1e60 "C" |
|
|
38 | rebasing 2:b18e25de2cf5 D "D" | |
|
39 | already rebased 3:26805aba1e60 C tip "C" | |
|
40 | 40 | o 4: fe3b4c6498fa D |
|
41 | 41 | | |
|
42 | 42 | | o 3: 26805aba1e60 C |
@@ -56,8 +56,8 b' Can collapse commits even if one is alre' | |||
|
56 | 56 | > |/ |
|
57 | 57 | > A |
|
58 | 58 | > EOF |
|
59 |
rebasing 2:b18e25de2cf5 "D" |
|
|
60 |
rebasing 3:26805aba1e60 "C" |
|
|
59 | rebasing 2:b18e25de2cf5 D "D" | |
|
60 | rebasing 3:26805aba1e60 C tip "C" | |
|
61 | 61 | o 4: a2493f4ace65 Collapsed revision |
|
62 | 62 | | * D |
|
63 | 63 | | * C |
@@ -81,7 +81,7 b" Abort doesn't lose the commits that were" | |||
|
81 | 81 | > A |
|
82 | 82 | > EOF |
|
83 | 83 | $ hg rebase -r C+D -d B |
|
84 |
rebasing 2:ef8c0fe0897b "D" |
|
|
84 | rebasing 2:ef8c0fe0897b D "D" | |
|
85 | 85 | merging file |
|
86 | 86 | warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
|
87 | 87 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -111,8 +111,8 b' the hole (B below), not on top of the de' | |||
|
111 | 111 | > | |
|
112 | 112 | > A |
|
113 | 113 | > EOF |
|
114 |
already rebased 1:112478962961 "B" |
|
|
115 |
rebasing 3:f585351a92f8 |
|
|
114 | already rebased 1:112478962961 B "B" | |
|
115 | rebasing 3:f585351a92f8 D tip "D" | |
|
116 | 116 | o 4: 1e6da8103bc7 D |
|
117 | 117 | | |
|
118 | 118 | | x 3: f585351a92f8 D |
@@ -60,7 +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" |
|
|
63 | rebasing 3:73a3ee40125d tip "rename A" | |
|
64 | 64 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg |
|
65 | 65 | |
|
66 | 66 | $ hg tglog |
@@ -134,8 +134,8 b' Rebased revision does not contain inform' | |||
|
134 | 134 | o 0: 1994f17a630e 'A' |
|
135 | 135 | |
|
136 | 136 | $ hg rebase -s 5 -d 4 |
|
137 |
rebasing 5:af8ad1f97097 "E" |
|
|
138 |
note: not rebasing 5:af8ad1f97097 "E" |
|
|
137 | rebasing 5:af8ad1f97097 tip "E" | |
|
138 | note: not rebasing 5:af8ad1f97097 tip "E", its destination already has all its changes | |
|
139 | 139 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/af8ad1f97097-c3e90708-rebase.hg |
|
140 | 140 | $ hg tglog |
|
141 | 141 | @ 4: 60f545c27784 'E' |
@@ -207,7 +207,7 b' Copy is tracked:' | |||
|
207 | 207 | Rebase the revision containing the copy: |
|
208 | 208 | |
|
209 | 209 | $ hg rebase -s 3 -d 2 |
|
210 |
rebasing 3:0a8162ff18a8 "copy A" |
|
|
210 | rebasing 3:0a8162ff18a8 tip "copy A" | |
|
211 | 211 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg |
|
212 | 212 | |
|
213 | 213 | $ hg tglog |
@@ -291,7 +291,7 b' Test rebase across repeating renames:' | |||
|
291 | 291 | |
|
292 | 292 | |
|
293 | 293 | $ hg rebase -s 4 -d 3 |
|
294 |
rebasing 4:b918d683b091 "Another unrelated change" |
|
|
294 | rebasing 4:b918d683b091 tip "Another unrelated change" | |
|
295 | 295 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg |
|
296 | 296 | |
|
297 | 297 | $ hg diff --stat -c . |
@@ -170,7 +170,7 b' F onto E - rebase of a branching point (' | |||
|
170 | 170 | rebasing 5:24b6387c8c8c "F" |
|
171 | 171 | rebasing 6:eea13746799a "G" |
|
172 | 172 | note: not rebasing 6:eea13746799a "G", its destination already has all its changes |
|
173 |
rebasing 7:02de42196ebe |
|
|
173 | rebasing 7:02de42196ebe tip "H" | |
|
174 | 174 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg |
|
175 | 175 | |
|
176 | 176 | $ hg tglog |
@@ -228,7 +228,7 b' F onto B - G maintains E as parent:' | |||
|
228 | 228 | $ hg rebase -s 5 -d 1 |
|
229 | 229 | rebasing 5:24b6387c8c8c "F" |
|
230 | 230 | rebasing 6:eea13746799a "G" |
|
231 |
rebasing 7:02de42196ebe |
|
|
231 | rebasing 7:02de42196ebe tip "H" | |
|
232 | 232 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg |
|
233 | 233 | |
|
234 | 234 | $ hg tglog |
@@ -339,32 +339,32 b' Check rebasing public changeset' | |||
|
339 | 339 | |
|
340 | 340 | $ hg rebase -d 5 -b 6 --keep |
|
341 | 341 | rebasing 6:e1c4361dd923 "C" |
|
342 |
rebasing 7:c9659aac0000 |
|
|
342 | rebasing 7:c9659aac0000 tip "D" | |
|
343 | 343 | |
|
344 | 344 | Check rebasing mutable changeset |
|
345 | 345 | Source phase greater or equal to destination phase: new changeset get the phase of source: |
|
346 | 346 | $ hg id -n |
|
347 | 347 | 5 |
|
348 | 348 | $ hg rebase -s9 -d0 |
|
349 |
rebasing 9:2b23e52411f4 |
|
|
349 | rebasing 9:2b23e52411f4 tip "D" | |
|
350 | 350 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-rebase.hg |
|
351 | 351 | $ hg id -n # check we updated back to parent |
|
352 | 352 | 5 |
|
353 | 353 | $ hg log --template "{phase}\n" -r 9 |
|
354 | 354 | draft |
|
355 | 355 | $ hg rebase -s9 -d1 |
|
356 |
rebasing 9:2cb10d0cfc6c |
|
|
356 | rebasing 9:2cb10d0cfc6c tip "D" | |
|
357 | 357 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-rebase.hg |
|
358 | 358 | $ hg log --template "{phase}\n" -r 9 |
|
359 | 359 | draft |
|
360 | 360 | $ hg phase --force --secret 9 |
|
361 | 361 | $ hg rebase -s9 -d0 |
|
362 |
rebasing 9:c5b12b67163a |
|
|
362 | rebasing 9:c5b12b67163a tip "D" | |
|
363 | 363 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-rebase.hg |
|
364 | 364 | $ hg log --template "{phase}\n" -r 9 |
|
365 | 365 | secret |
|
366 | 366 | $ hg rebase -s9 -d1 |
|
367 |
rebasing 9:2a0524f868ac |
|
|
367 | rebasing 9:2a0524f868ac tip "D" | |
|
368 | 368 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-rebase.hg |
|
369 | 369 | $ hg log --template "{phase}\n" -r 9 |
|
370 | 370 | secret |
@@ -461,7 +461,7 b' Source on have two descendant heads but ' | |||
|
461 | 461 | rebasing 3:ffd453c31098 "D" |
|
462 | 462 | rebasing 6:3d8a618087a7 "G" |
|
463 | 463 | rebasing 7:72434a4e60b0 "H" |
|
464 |
rebasing 8:479ddb54a924 "I" |
|
|
464 | rebasing 8:479ddb54a924 tip "I" | |
|
465 | 465 | $ hg tglog |
|
466 | 466 | o 13: 9bf1d9358a90 'I' |
|
467 | 467 | | |
@@ -506,7 +506,7 b' Base on have one descendant heads we ask' | |||
|
506 | 506 | rebasing 3:ffd453c31098 "D" |
|
507 | 507 | rebasing 6:3d8a618087a7 "G" |
|
508 | 508 | rebasing 7:72434a4e60b0 "H" |
|
509 |
rebasing 8:479ddb54a924 "I" |
|
|
509 | rebasing 8:479ddb54a924 tip "I" | |
|
510 | 510 | $ hg tglog |
|
511 | 511 | o 12: 9d7da0053b1c 'I' |
|
512 | 512 | | |
@@ -632,7 +632,7 b' rebase on ancestor with revset' | |||
|
632 | 632 | $ hg rebase -r '6::' -d 2 |
|
633 | 633 | rebasing 6:3d8a618087a7 "G" |
|
634 | 634 | rebasing 7:72434a4e60b0 "H" |
|
635 |
rebasing 8:479ddb54a924 "I" |
|
|
635 | rebasing 8:479ddb54a924 tip "I" | |
|
636 | 636 | saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg |
|
637 | 637 | $ hg tglog |
|
638 | 638 | o 8: fcb52e68a694 'I' |
@@ -667,7 +667,7 b' We would expect heads are I, F if it was' | |||
|
667 | 667 | rebasing 5:41bfcc75ed73 "F" |
|
668 | 668 | rebasing 6:3d8a618087a7 "G" |
|
669 | 669 | rebasing 7:72434a4e60b0 "H" |
|
670 |
rebasing 8:479ddb54a924 "I" |
|
|
670 | rebasing 8:479ddb54a924 tip "I" | |
|
671 | 671 | saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg |
|
672 | 672 | $ hg tglog |
|
673 | 673 | o 8: 9136df9a87cf 'I' |
@@ -736,7 +736,7 b' each root have a different common ancest' | |||
|
736 | 736 | |
|
737 | 737 | $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)' |
|
738 | 738 | rebasing 8:e7ec4e813ba6 "I" |
|
739 |
rebasing 10:23a4ace37988 "K" |
|
|
739 | rebasing 10:23a4ace37988 tip "K" | |
|
740 | 740 | saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg |
|
741 | 741 | $ hg log --rev 'children(desc(G))' |
|
742 | 742 | changeset: 9:adb617877056 |
@@ -803,7 +803,7 b' Test that rebase is not confused by $CWD' | |||
|
803 | 803 | rebasing 2:779a07b1b7a0 "first source commit" |
|
804 | 804 | current directory was removed (rmcwd !) |
|
805 | 805 | (consider changing to repo root: $TESTTMP/cwd-vanish) (rmcwd !) |
|
806 |
rebasing 3:a7d6f3a00bf3 "second source with subdir" |
|
|
806 | rebasing 3:a7d6f3a00bf3 tip "second source with subdir" | |
|
807 | 807 | saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg |
|
808 | 808 | |
|
809 | 809 | Get back to the root of cwd-vanish. Note that even though `cd ..` |
@@ -979,7 +979,7 b' Testing rebase being called inside anoth' | |||
|
979 | 979 | > EOS |
|
980 | 980 | |
|
981 | 981 | $ hg rebase -s C -d B |
|
982 |
rebasing 2:dc0947a82db8 "C" |
|
|
982 | rebasing 2:dc0947a82db8 C tip "C" | |
|
983 | 983 | |
|
984 | 984 | $ [ -f .hg/rebasestate ] && echo 'WRONG: rebasestate should not exist' |
|
985 | 985 | [1] |
@@ -103,8 +103,8 b' continued' | |||
|
103 | 103 | > A |
|
104 | 104 | > EOF |
|
105 | 105 | $ hg rebase --collapse -b D -d Z |
|
106 |
rebasing 1:112478962961 "B" |
|
|
107 |
rebasing 3:c26739dbe603 "C" |
|
|
106 | rebasing 1:112478962961 B "B" | |
|
107 | rebasing 3:c26739dbe603 C "C" | |
|
108 | 108 | merging conflict |
|
109 | 109 | warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark') |
|
110 | 110 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
@@ -132,9 +132,9 b' continued' | |||
|
132 | 132 | (no more unresolved files) |
|
133 | 133 | continue: hg rebase --continue |
|
134 | 134 | $ hg continue |
|
135 |
already rebased 1:112478962961 "B" |
|
|
136 |
rebasing 3:c26739dbe603 "C" |
|
|
137 |
rebasing 5:d24bb333861c "D" |
|
|
135 | already rebased 1:112478962961 B "B" as 79bc8f4973ce | |
|
136 | rebasing 3:c26739dbe603 C "C" | |
|
137 | rebasing 5:d24bb333861c D tip "D" | |
|
138 | 138 | saved backup bundle to $TESTTMP/collapse-conflict/.hg/strip-backup/112478962961-b5b34645-rebase.hg |
|
139 | 139 | $ hg tglog |
|
140 | 140 | o 3: Collapsed revision |
@@ -165,9 +165,9 b' rebase can then be continued' | |||
|
165 | 165 | > A |
|
166 | 166 | > EOF |
|
167 | 167 | $ HGEDITOR=false hg --config ui.interactive=1 rebase --collapse -b D -d Z |
|
168 |
rebasing 1:112478962961 "B" |
|
|
169 |
rebasing 3:26805aba1e60 "C" |
|
|
170 |
rebasing 5:f585351a92f8 "D" |
|
|
168 | rebasing 1:112478962961 B "B" | |
|
169 | rebasing 3:26805aba1e60 C "C" | |
|
170 | rebasing 5:f585351a92f8 D tip "D" | |
|
171 | 171 | transaction abort! |
|
172 | 172 | rollback completed |
|
173 | 173 | abort: edit failed: false exited with status 1 |
@@ -186,9 +186,9 b' rebase can then be continued' | |||
|
186 | 186 | o 0: A |
|
187 | 187 | |
|
188 | 188 | $ hg continue |
|
189 |
rebasing 1:112478962961 "B" |
|
|
190 |
rebasing 3:26805aba1e60 "C" |
|
|
191 |
rebasing 5:f585351a92f8 "D" |
|
|
189 | rebasing 1:112478962961 B "B" | |
|
190 | rebasing 3:26805aba1e60 C "C" | |
|
191 | rebasing 5:f585351a92f8 D tip "D" | |
|
192 | 192 | saved backup bundle to $TESTTMP/collapse-cancel-editor/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg |
|
193 | 193 | $ hg tglog |
|
194 | 194 | o 3: Collapsed revision |
@@ -229,7 +229,7 b'' | |||
|
229 | 229 | .. flaky, the core the test is checked when checking the cache dir, so |
|
230 | 230 | .. hopefully this flakyness is not hiding any actual bug. |
|
231 | 231 | $ hg rebase -s temporary -d foo |
|
232 |
rebasing 3:d9cf06e3b5b6 "b" |
|
|
232 | rebasing 3:d9cf06e3b5b6 tip temporary "b" | |
|
233 | 233 | saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/d9cf06e3b5b6-e5c3dc63-rebase.hg |
|
234 | 234 | ? files fetched over ? fetches - (? misses, 0.00% hit ratio) over *s (glob) |
|
235 | 235 | $ find $CACHEDIR -type f | sort |
@@ -32,7 +32,7 b'' | |||
|
32 | 32 | b292c1e3311f |
|
33 | 33 | |
|
34 | 34 | $ hg rebase -d 1 |
|
35 |
rebasing 2:0632994590a8 "xx" |
|
|
35 | rebasing 2:0632994590a8 tip "xx" | |
|
36 | 36 | saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/0632994590a8-0bc786d8-rebase.hg (glob) |
|
37 | 37 | $ hg log -f x --template "{node|short}\n" |
|
38 | 38 | 81deab2073bc |
@@ -41,14 +41,14 b'' | |||
|
41 | 41 | # Rebase back, log -f still works |
|
42 | 42 | |
|
43 | 43 | $ hg rebase -d 0 -r 2 |
|
44 |
rebasing 2:81deab2073bc "xx" |
|
|
44 | rebasing 2:81deab2073bc tip "xx" | |
|
45 | 45 | saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/81deab2073bc-80cb4fda-rebase.hg (glob) |
|
46 | 46 | $ hg log -f x --template "{node|short}\n" |
|
47 | 47 | b3fca10fb42d |
|
48 | 48 | b292c1e3311f |
|
49 | 49 | |
|
50 | 50 | $ hg rebase -d 1 -r 2 |
|
51 |
rebasing 2:b3fca10fb42d "xx" |
|
|
51 | rebasing 2:b3fca10fb42d tip "xx" | |
|
52 | 52 | saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/b3fca10fb42d-da73a0c7-rebase.hg (glob) |
|
53 | 53 | |
|
54 | 54 | $ cd .. |
@@ -99,4 +99,4 b' pulled' | |||
|
99 | 99 | $ hg prefetch -r '. + .^' -I x -I z |
|
100 | 100 | 4 files fetched over 1 fetches - (4 misses, 0.00% hit ratio) over * (glob) |
|
101 | 101 | $ hg rebase -d 2 --keep |
|
102 |
rebasing 1:876b1317060d "x2" |
|
|
102 | rebasing 1:876b1317060d foo "x2" |
@@ -54,7 +54,7 b' shelve should leave dirstate clean (issu' | |||
|
54 | 54 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
55 | 55 | |
|
56 | 56 | $ hg rebase -d 6c103be8f4e4 --config extensions.rebase= |
|
57 |
rebasing 2:323bfa07f744 "xyz" |
|
|
57 | rebasing 2:323bfa07f744( tip)? "xyz" (re) | |
|
58 | 58 | merging x |
|
59 | 59 | saved backup bundle to \$TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-(78114325|7ae538ef)-rebase.hg (re) |
|
60 | 60 | $ hg unshelve |
@@ -196,7 +196,7 b' For now, manually remove the files' | |||
|
196 | 196 | Verify rebase temporarily includes excluded files |
|
197 | 197 | |
|
198 | 198 | $ hg rebase -d 1 -r 2 --config extensions.rebase= |
|
199 |
rebasing 2:b91df4f39e75 "edit hide" |
|
|
199 | rebasing 2:b91df4f39e75 tip "edit hide" | |
|
200 | 200 | temporarily included 2 file(s) in the sparse checkout for merging |
|
201 | 201 | merging hide |
|
202 | 202 | warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') |
@@ -279,7 +279,7 b' Verify rebase succeeds if all changed fi' | |||
|
279 | 279 | |
|
280 | 280 | $ hg commit -Aqm "add show2" |
|
281 | 281 | $ hg rebase -d 1 --config extensions.rebase= |
|
282 |
rebasing 2:bdde55290160 "add show2" |
|
|
282 | rebasing 2:bdde55290160 tip "add show2" | |
|
283 | 283 | saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/bdde55290160-216ed9c6-rebase.hg |
|
284 | 284 | |
|
285 | 285 | Verify log --sparse only shows commits that affect the sparse checkout |
@@ -368,9 +368,9 b' Split a non-head' | |||
|
368 | 368 | $ cp -R . ../d |
|
369 | 369 | |
|
370 | 370 | $ runsplit -r 1 | grep rebasing |
|
371 |
rebasing 2:b5c5ea414030 "d1" |
|
|
372 |
rebasing 3:f4a0a8d004cc "d2" |
|
|
373 |
rebasing 4:777940761eba "d3" |
|
|
371 | rebasing 2:b5c5ea414030 d1 "d1" | |
|
372 | rebasing 3:f4a0a8d004cc d2 "d2" | |
|
373 | rebasing 4:777940761eba d3 "d3" | |
|
374 | 374 | #if obsstore-off |
|
375 | 375 | $ hg bookmark |
|
376 | 376 | d1 4:c4b449ef030e |
General Comments 0
You need to be logged in to leave comments.
Login now