equal
deleted
inserted
replaced
52 |/ desc: mv a b, mv dir/ dir2/ |
52 |/ desc: mv a b, mv dir/ dir2/ |
53 o rev: 0 |
53 o rev: 0 |
54 desc: initial |
54 desc: initial |
55 |
55 |
56 $ hg rebase -s . -d 1 |
56 $ hg rebase -s . -d 1 |
57 rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip) |
57 rebasing 2:557f403c0afd tip "mod a, mod dir/file.txt" |
58 merging b and a to b |
58 merging b and a to b |
59 merging dir2/file.txt and dir/file.txt to dir2/file.txt |
59 merging dir2/file.txt and dir/file.txt to dir2/file.txt |
60 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-rebase.hg |
60 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-rebase.hg |
61 $ cd .. |
61 $ cd .. |
62 $ rm -rf repo |
62 $ rm -rf repo |
85 |/ desc: rm a, add b |
85 |/ desc: rm a, add b |
86 o rev: 0 |
86 o rev: 0 |
87 desc: initial |
87 desc: initial |
88 |
88 |
89 $ hg rebase -s . -d 1 |
89 $ hg rebase -s . -d 1 |
90 rebasing 2:d526312210b9 "mode a" (tip) |
90 rebasing 2:d526312210b9 tip "mode a" |
91 file 'a' was deleted in local [dest] but was modified in other [source]. |
91 file 'a' was deleted in local [dest] but was modified in other [source]. |
92 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
92 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
93 What do you want to do? u |
93 What do you want to do? u |
94 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
94 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
95 [1] |
95 [1] |
124 | desc: randomcommit |
124 | desc: randomcommit |
125 o rev: 0, phase: draft |
125 o rev: 0, phase: draft |
126 desc: initial |
126 desc: initial |
127 |
127 |
128 $ hg rebase -s . -d 2 |
128 $ hg rebase -s . -d 2 |
129 rebasing 3:9d5cf99c3d9f "mod a" (tip) |
129 rebasing 3:9d5cf99c3d9f tip "mod a" |
130 merging b and a to b |
130 merging b and a to b |
131 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg |
131 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg |
132 $ cd .. |
132 $ cd .. |
133 $ rm -rf repo |
133 $ rm -rf repo |
134 |
134 |
159 | desc: randomcommit |
159 | desc: randomcommit |
160 o rev: 0 |
160 o rev: 0 |
161 desc: initial |
161 desc: initial |
162 |
162 |
163 $ hg rebase -s . -d 0 |
163 $ hg rebase -s . -d 0 |
164 rebasing 3:fbe97126b396 "mod b" (tip) |
164 rebasing 3:fbe97126b396 tip "mod b" |
165 merging a and b to a |
165 merging a and b to a |
166 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg |
166 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg |
167 $ cd .. |
167 $ cd .. |
168 $ rm -rf repo |
168 $ rm -rf repo |
169 |
169 |
196 |/ desc: mv dir/a dir/b |
196 |/ desc: mv dir/a dir/b |
197 o rev: 0 |
197 o rev: 0 |
198 desc: initial |
198 desc: initial |
199 |
199 |
200 $ hg rebase -s . -d 2 |
200 $ hg rebase -s . -d 2 |
201 rebasing 3:6b2f4cece40f "mod dir/a" (tip) |
201 rebasing 3:6b2f4cece40f tip "mod dir/a" |
202 merging dir/b and dir/a to dir/b |
202 merging dir/b and dir/a to dir/b |
203 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg |
203 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg |
204 $ cd .. |
204 $ cd .. |
205 $ rm -rf repo |
205 $ rm -rf repo |
206 |
206 |
241 desc: initial |
241 desc: initial |
242 |
242 |
243 With small limit |
243 With small limit |
244 |
244 |
245 $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 |
245 $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 |
246 rebasing 2:ef716627c70b "mod a" (tip) |
246 rebasing 2:ef716627c70b tip "mod a" |
247 skipping copytracing for 'a', more candidates than the limit: 7 |
247 skipping copytracing for 'a', more candidates than the limit: 7 |
248 file 'a' was deleted in local [dest] but was modified in other [source]. |
248 file 'a' was deleted in local [dest] but was modified in other [source]. |
249 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
249 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
250 What do you want to do? u |
250 What do you want to do? u |
251 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
251 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
255 rebase aborted |
255 rebase aborted |
256 |
256 |
257 With default limit which is 100 |
257 With default limit which is 100 |
258 |
258 |
259 $ hg rebase -s 2 -d 1 |
259 $ hg rebase -s 2 -d 1 |
260 rebasing 2:ef716627c70b "mod a" (tip) |
260 rebasing 2:ef716627c70b tip "mod a" |
261 merging foo and a to foo |
261 merging foo and a to foo |
262 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg |
262 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg |
263 |
263 |
264 $ cd .. |
264 $ cd .. |
265 $ rm -rf repo |
265 $ rm -rf repo |
321 |/ desc: mod dir/a |
321 |/ desc: mod dir/a |
322 o rev: 0 |
322 o rev: 0 |
323 desc: initial |
323 desc: initial |
324 |
324 |
325 $ hg rebase -s . -d 1 |
325 $ hg rebase -s . -d 1 |
326 rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip) |
326 rebasing 2:a33d80b6e352 tip "mv dir/ dir2/" |
327 merging dir/a and dir2/a to dir2/a |
327 merging dir/a and dir2/a to dir2/a |
328 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg |
328 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg |
329 $ cd .. |
329 $ cd .. |
330 $ rm -rf server |
330 $ rm -rf server |
331 $ rm -rf repo |
331 $ rm -rf repo |
356 | o rev: 1 |
356 | o rev: 1 |
357 |/ desc: mv a b |
357 |/ desc: mv a b |
358 o rev: 0 |
358 o rev: 0 |
359 desc: initial |
359 desc: initial |
360 $ hg rebase -s . -d 2 |
360 $ hg rebase -s . -d 2 |
361 rebasing 3:d41316942216 "mod a" (tip) |
361 rebasing 3:d41316942216 tip "mod a" |
362 merging c and a to c |
362 merging c and a to c |
363 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg |
363 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg |
364 |
364 |
365 $ cd .. |
365 $ cd .. |
366 $ rm -rf repo |
366 $ rm -rf repo |
429 |/ desc: mv a b |
429 |/ desc: mv a b |
430 o rev: 0 |
430 o rev: 0 |
431 desc: initial |
431 desc: initial |
432 |
432 |
433 $ hg rebase -s . -d 2 |
433 $ hg rebase -s . -d 2 |
434 rebasing 3:ef716627c70b "mod a" (tip) |
434 rebasing 3:ef716627c70b tip "mod a" |
435 merging b and a to b |
435 merging b and a to b |
436 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg |
436 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg |
437 $ ls -A |
437 $ ls -A |
438 .hg |
438 .hg |
439 b |
439 b |
502 |/ desc: cp a c, mv a b |
502 |/ desc: cp a c, mv a b |
503 o rev: 0 |
503 o rev: 0 |
504 desc: initial |
504 desc: initial |
505 |
505 |
506 $ hg rebase -s . -d 1 |
506 $ hg rebase -s . -d 1 |
507 rebasing 2:ef716627c70b "mod a" (tip) |
507 rebasing 2:ef716627c70b tip "mod a" |
508 merging b and a to b |
508 merging b and a to b |
509 merging c and a to c |
509 merging c and a to c |
510 saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg |
510 saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg |
511 $ ls -A |
511 $ ls -A |
512 .hg |
512 .hg |
629 |/ desc: mv a b; mv dir1 dir2 |
629 |/ desc: mv a b; mv dir1 dir2 |
630 o rev: 0, phase: draft |
630 o rev: 0, phase: draft |
631 desc: initial |
631 desc: initial |
632 |
632 |
633 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 |
633 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 |
634 rebasing 2:6207d2d318e7 "mod a" (tip) |
634 rebasing 2:6207d2d318e7 tip "mod a" |
635 merging dir2/b and dir1/a to dir2/b |
635 merging dir2/b and dir1/a to dir2/b |
636 saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg |
636 saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg |
637 $ cat dir2/b |
637 $ cat dir2/b |
638 a |
638 a |
639 b |
639 b |
667 |/ desc: hg add dir1/a |
667 |/ desc: hg add dir1/a |
668 o rev: 0, phase: draft |
668 o rev: 0, phase: draft |
669 desc: initial |
669 desc: initial |
670 |
670 |
671 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 |
671 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 |
672 rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip) |
672 rebasing 2:e8919e7df8d0 tip "mv dir1 dir2" |
673 saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg |
673 saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg |
674 $ ls dir2 |
674 $ ls dir2 |
675 a |
675 a |
676 dummy |
676 dummy |
677 $ rm -rf repo |
677 $ rm -rf repo |