Mercurial > hg
comparison tests/test-copytrace-heuristics.t @ 42183:802ae9772ced
tests: make log style a little easier to read in test-copytrace-heuristics.t
Revision numbers are much shorter and easier to read (especially
compared to the full nodeids that were used here), so I switched to
that. That's also what almost all the commands used (e.g. `hg rebase
-s . -d 1`). I updated the two instances that used nodeids. I also
made some other little cleanups to the log templates.
Differential Revision: https://phab.mercurial-scm.org/D6279
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 18 Apr 2019 22:16:33 -0700 |
parents | 1afd9d1e55ca |
children | 3de4f17f4824 |
comparison
equal
deleted
inserted
replaced
42182:fad480dad04d | 42183:802ae9772ced |
---|---|
15 $ cat >> $HGRCPATH << EOF | 15 $ cat >> $HGRCPATH << EOF |
16 > [extensions] | 16 > [extensions] |
17 > rebase= | 17 > rebase= |
18 > shelve= | 18 > shelve= |
19 > [alias] | 19 > [alias] |
20 > l = log -G -T 'changeset: {node}\n desc: {desc}\n' | 20 > l = log -G -T 'rev: {rev}\ndesc: {desc}\n' |
21 > pl = log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' | 21 > pl = log -G -T 'rev: {rev}, phase: {phase}\ndesc: {desc}\n' |
22 > EOF | 22 > EOF |
23 | 23 |
24 NOTE: calling initclient() set copytrace.sourcecommitlimit=-1 as we want to | 24 NOTE: calling initclient() set copytrace.sourcecommitlimit=-1 as we want to |
25 prevent the full copytrace algorithm to run and test the heuristic algorithm | 25 prevent the full copytrace algorithm to run and test the heuristic algorithm |
26 without complexing the test cases with public and draft commits. | 26 without complexing the test cases with public and draft commits. |
45 $ echo b > a | 45 $ echo b > a |
46 $ echo b > dir/file.txt | 46 $ echo b > dir/file.txt |
47 $ hg ci -qm 'mod a, mod dir/file.txt' | 47 $ hg ci -qm 'mod a, mod dir/file.txt' |
48 | 48 |
49 $ hg l | 49 $ hg l |
50 @ changeset: 557f403c0afd2a3cf15d7e2fb1f1001a8b85e081 | 50 @ rev: 2 |
51 | desc: mod a, mod dir/file.txt | 51 | desc: mod a, mod dir/file.txt |
52 | o changeset: 928d74bc9110681920854d845c06959f6dfc9547 | 52 | o rev: 1 |
53 |/ desc: mv a b, mv dir/ dir2/ | 53 |/ desc: mv a b, mv dir/ dir2/ |
54 o changeset: 3c482b16e54596fed340d05ffaf155f156cda7ee | 54 o rev: 0 |
55 desc: initial | 55 desc: initial |
56 | 56 |
57 $ hg rebase -s . -d 1 | 57 $ hg rebase -s . -d 1 |
58 rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip) | 58 rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip) |
59 merging b and a to b | 59 merging b and a to b |
60 merging dir2/file.txt and dir/file.txt to dir2/file.txt | 60 merging dir2/file.txt and dir/file.txt to dir2/file.txt |
78 $ hg up -q 0 | 78 $ hg up -q 0 |
79 $ printf 'somecontent\nmoarcontent' > a | 79 $ printf 'somecontent\nmoarcontent' > a |
80 $ hg ci -qm 'mode a' | 80 $ hg ci -qm 'mode a' |
81 | 81 |
82 $ hg l | 82 $ hg l |
83 @ changeset: d526312210b9e8f795d576a77dc643796384d86e | 83 @ rev: 2 |
84 | desc: mode a | 84 | desc: mode a |
85 | o changeset: 46985f76c7e5e5123433527f5c8526806145650b | 85 | o rev: 1 |
86 |/ desc: rm a, add b | 86 |/ desc: rm a, add b |
87 o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | 87 o rev: 0 |
88 desc: initial | 88 desc: initial |
89 | 89 |
90 $ hg rebase -s . -d 1 | 90 $ hg rebase -s . -d 1 |
91 rebasing 2:d526312210b9 "mode a" (tip) | 91 rebasing 2:d526312210b9 "mode a" (tip) |
92 file 'a' was deleted in local [dest] but was modified in other [source]. | 92 file 'a' was deleted in local [dest] but was modified in other [source]. |
93 What do you want to do? | 93 What do you want to do? |
115 $ hg up -q 1 | 115 $ hg up -q 1 |
116 $ echo b > a | 116 $ echo b > a |
117 $ hg ci -qm 'mod a' | 117 $ hg ci -qm 'mod a' |
118 | 118 |
119 $ hg pl | 119 $ hg pl |
120 @ changeset: 9d5cf99c3d9f8e8b05ba55421f7f56530cfcf3bc | 120 @ rev: 3, phase: draft |
121 | desc: mod a, phase: draft | 121 | desc: mod a |
122 | o changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d | 122 | o rev: 2, phase: draft |
123 |/ desc: mv a b, phase: draft | 123 |/ desc: mv a b |
124 o changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83 | 124 o rev: 1, phase: draft |
125 | desc: randomcommit, phase: draft | 125 | desc: randomcommit |
126 o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | 126 o rev: 0, phase: draft |
127 desc: initial, phase: draft | 127 desc: initial |
128 | 128 |
129 $ hg rebase -s . -d 2 | 129 $ hg rebase -s . -d 2 |
130 rebasing 3:9d5cf99c3d9f "mod a" (tip) | 130 rebasing 3:9d5cf99c3d9f "mod a" (tip) |
131 merging b and a to b | 131 merging b and a to b |
132 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg | 132 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg |
150 $ hg up -q 2 | 150 $ hg up -q 2 |
151 $ echo b > b | 151 $ echo b > b |
152 $ hg ci -qm 'mod b' | 152 $ hg ci -qm 'mod b' |
153 | 153 |
154 $ hg l | 154 $ hg l |
155 @ changeset: fbe97126b3969056795c462a67d93faf13e4d298 | 155 @ rev: 3 |
156 | desc: mod b | 156 | desc: mod b |
157 o changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d | 157 o rev: 2 |
158 | desc: mv a b | 158 | desc: mv a b |
159 o changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83 | 159 o rev: 1 |
160 | desc: randomcommit | 160 | desc: randomcommit |
161 o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | 161 o rev: 0 |
162 desc: initial | 162 desc: initial |
163 | 163 |
164 $ hg rebase -s . -d 0 | 164 $ hg rebase -s . -d 0 |
165 rebasing 3:fbe97126b396 "mod b" (tip) | 165 rebasing 3:fbe97126b396 "mod b" (tip) |
166 merging a and b to a | 166 merging a and b to a |
167 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg | 167 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg |
187 $ hg up -q 0 | 187 $ hg up -q 0 |
188 $ echo b > dir/a | 188 $ echo b > dir/a |
189 $ hg ci -qm 'mod dir/a' | 189 $ hg ci -qm 'mod dir/a' |
190 | 190 |
191 $ hg l | 191 $ hg l |
192 @ changeset: 6b2f4cece40fd320f41229f23821256ffc08efea | 192 @ rev: 3 |
193 | desc: mod dir/a | 193 | desc: mod dir/a |
194 | o changeset: 4494bf7efd2e0dfdd388e767fb913a8a3731e3fa | 194 | o rev: 2 |
195 | | desc: create dir2/a | 195 | | desc: create dir2/a |
196 | o changeset: b1784dfab6ea6bfafeb11c0ac50a2981b0fe6ade | 196 | o rev: 1 |
197 |/ desc: mv dir/a dir/b | 197 |/ desc: mv dir/a dir/b |
198 o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 | 198 o rev: 0 |
199 desc: initial | 199 desc: initial |
200 | 200 |
201 $ hg rebase -s . -d 2 | 201 $ hg rebase -s . -d 2 |
202 rebasing 3:6b2f4cece40f "mod dir/a" (tip) | 202 rebasing 3:6b2f4cece40f "mod dir/a" (tip) |
203 merging dir/b and dir/a to dir/b | 203 merging dir/b and dir/a to dir/b |
204 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg | 204 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg |
232 $ echo b > a | 232 $ echo b > a |
233 $ hg ci -m 'mod a' | 233 $ hg ci -m 'mod a' |
234 created new head | 234 created new head |
235 | 235 |
236 $ hg l | 236 $ hg l |
237 @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | 237 @ rev: 2 |
238 | desc: mod a | 238 | desc: mod a |
239 | o changeset: 8329d5c6bf479ec5ca59b9864f3f45d07213f5a4 | 239 | o rev: 1 |
240 |/ desc: mv a foo, add many files | 240 |/ desc: mv a foo, add many files |
241 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | 241 o rev: 0 |
242 desc: initial | 242 desc: initial |
243 | 243 |
244 With small limit | 244 With small limit |
245 | 245 |
246 $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 | 246 $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 |
247 rebasing 2:ef716627c70b "mod a" (tip) | 247 rebasing 2:ef716627c70b "mod a" (tip) |
280 $ hg rm a | 280 $ hg rm a |
281 $ hg ci -m 'del a' | 281 $ hg ci -m 'del a' |
282 created new head | 282 created new head |
283 | 283 |
284 $ hg pl | 284 $ hg pl |
285 @ changeset: 7d61ee3b1e48577891a072024968428ba465c47b | 285 @ rev: 2, phase: draft |
286 | desc: del a, phase: draft | 286 | desc: del a |
287 | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | 287 | o rev: 1, phase: draft |
288 |/ desc: mv a b, phase: draft | 288 |/ desc: mv a b |
289 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | 289 o rev: 0, phase: draft |
290 desc: initial, phase: draft | 290 desc: initial |
291 | 291 |
292 $ hg rebase -s 1 -d 2 | 292 $ hg rebase -s 1 -d 2 |
293 rebasing 1:472e38d57782 "mv a b" | 293 rebasing 1:472e38d57782 "mv a b" |
294 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg | 294 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg |
295 $ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062 | 295 $ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062 |
313 $ hg up -q ".^" | 313 $ hg up -q ".^" |
314 $ hg mv -q dir/ dir2 | 314 $ hg mv -q dir/ dir2 |
315 $ hg ci -qm 'mv dir/ dir2/' | 315 $ hg ci -qm 'mv dir/ dir2/' |
316 | 316 |
317 $ hg l | 317 $ hg l |
318 @ changeset: a33d80b6e352591dfd82784e1ad6cdd86b25a239 | 318 @ rev: 2 |
319 | desc: mv dir/ dir2/ | 319 | desc: mv dir/ dir2/ |
320 | o changeset: 6b2f4cece40fd320f41229f23821256ffc08efea | 320 | o rev: 1 |
321 |/ desc: mod dir/a | 321 |/ desc: mod dir/a |
322 o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 | 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 "mv dir/ dir2/" (tip) |
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 |
347 $ echo c > a | 347 $ echo c > a |
348 $ hg ci -m 'mod a' | 348 $ hg ci -m 'mod a' |
349 created new head | 349 created new head |
350 | 350 |
351 $ hg l | 351 $ hg l |
352 @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3 | 352 @ rev: 3 |
353 | desc: mod a | 353 | desc: mod a |
354 | o changeset: d3efd280421d24f9f229997c19e654761c942a71 | 354 | o rev: 2 |
355 | | desc: mv b c | 355 | | desc: mv b c |
356 | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | 356 | o rev: 1 |
357 |/ desc: mv a b | 357 |/ desc: mv a b |
358 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | 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 "mod a" (tip) |
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 |
381 $ hg up -q 0 | 381 $ hg up -q 0 |
382 $ echo c > a | 382 $ echo c > a |
383 $ hg ci -m 'mod a' | 383 $ hg ci -m 'mod a' |
384 created new head | 384 created new head |
385 $ hg l | 385 $ hg l |
386 @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3 | 386 @ rev: 3 |
387 | desc: mod a | 387 | desc: mod a |
388 | o changeset: d3efd280421d24f9f229997c19e654761c942a71 | 388 | o rev: 2 |
389 | | desc: mv b c | 389 | | desc: mv b c |
390 | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | 390 | o rev: 1 |
391 |/ desc: mv a b | 391 |/ desc: mv a b |
392 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | 392 o rev: 0 |
393 desc: initial | 393 desc: initial |
394 $ hg rebase -s 1 -d . | 394 $ hg rebase -s 1 -d . |
395 rebasing 1:472e38d57782 "mv a b" | 395 rebasing 1:472e38d57782 "mv a b" |
396 merging a and b to b | 396 merging a and b to b |
397 rebasing 2:d3efd280421d "mv b c" | 397 rebasing 2:d3efd280421d "mv b c" |
398 merging b and c to c | 398 merging b and c to c |
419 $ echo b > a | 419 $ echo b > a |
420 $ hg ci -m 'mod a' | 420 $ hg ci -m 'mod a' |
421 created new head | 421 created new head |
422 | 422 |
423 $ hg l | 423 $ hg l |
424 @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | 424 @ rev: 3 |
425 | desc: mod a | 425 | desc: mod a |
426 | o changeset: b1a6187e79fbce851bb584eadcb0cc4a80290fd9 | 426 | o rev: 2 |
427 | | desc: add c | 427 | | desc: add c |
428 | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | 428 | o rev: 1 |
429 |/ desc: mv a b | 429 |/ desc: mv a b |
430 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | 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 "mod a" (tip) |
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 |
457 $ hg ci -m 'mv a b' | 457 $ hg ci -m 'mv a b' |
458 created new head | 458 created new head |
459 $ hg up -q 2 | 459 $ hg up -q 2 |
460 | 460 |
461 $ hg l | 461 $ hg l |
462 @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | 462 @ rev: 2 |
463 | desc: mv a b | 463 | desc: mv a b |
464 | o changeset: b0357b07f79129a3d08a68621271ca1352ae8a09 | 464 | o rev: 1 |
465 |/ desc: modify a | 465 |/ desc: modify a |
466 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | 466 o rev: 0 |
467 desc: initial | 467 desc: initial |
468 | 468 |
469 $ hg merge 1 | 469 $ hg merge 1 |
470 merging b and a to b | 470 merging b and a to b |
471 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 471 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
472 (branch merge, don't forget to commit) | 472 (branch merge, don't forget to commit) |
492 $ echo b > a | 492 $ echo b > a |
493 $ hg ci -m 'mod a' | 493 $ hg ci -m 'mod a' |
494 created new head | 494 created new head |
495 | 495 |
496 $ hg l | 496 $ hg l |
497 @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | 497 @ rev: 2 |
498 | desc: mod a | 498 | desc: mod a |
499 | o changeset: 4fc3fd13fbdb89ada6b75bfcef3911a689a0dde8 | 499 | o rev: 1 |
500 |/ desc: cp a c, mv a b | 500 |/ desc: cp a c, mv a b |
501 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | 501 o rev: 0 |
502 desc: initial | 502 desc: initial |
503 | 503 |
504 $ hg rebase -s . -d 1 | 504 $ hg rebase -s . -d 1 |
505 rebasing 2:ef716627c70b "mod a" (tip) | 505 rebasing 2:ef716627c70b "mod a" (tip) |
506 merging b and a to b | 506 merging b and a to b |
507 merging c and a to c | 507 merging c and a to c |
532 $ hg ci -qm 'mv a b' | 532 $ hg ci -qm 'mv a b' |
533 $ hg mv b c | 533 $ hg mv b c |
534 $ hg ci -qm 'mv b c' | 534 $ hg ci -qm 'mv b c' |
535 $ hg up -q 1 | 535 $ hg up -q 1 |
536 $ hg l | 536 $ hg l |
537 o changeset: d3efd280421d24f9f229997c19e654761c942a71 | 537 o rev: 3 |
538 | desc: mv b c | 538 | desc: mv b c |
539 o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | 539 o rev: 2 |
540 | desc: mv a b | 540 | desc: mv a b |
541 | @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | 541 | @ rev: 1 |
542 |/ desc: mod a | 542 |/ desc: mod a |
543 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | 543 o rev: 0 |
544 desc: initial | 544 desc: initial |
545 | 545 |
546 $ hg merge 3 | 546 $ hg merge 3 |
547 merging a and c to c | 547 merging a and c to c |
548 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 548 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
549 (branch merge, don't forget to commit) | 549 (branch merge, don't forget to commit) |
550 $ hg ci -qm 'merge' | 550 $ hg ci -qm 'merge' |
551 $ hg pl | 551 $ hg pl |
552 @ changeset: cd29b0d08c0f39bfed4cde1b40e30f419db0c825 | 552 @ rev: 4, phase: draft |
553 |\ desc: merge, phase: draft | 553 |\ desc: merge |
554 | o changeset: d3efd280421d24f9f229997c19e654761c942a71 | 554 | o rev: 3, phase: draft |
555 | | desc: mv b c, phase: draft | 555 | | desc: mv b c |
556 | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | 556 | o rev: 2, phase: draft |
557 | | desc: mv a b, phase: draft | 557 | | desc: mv a b |
558 o | changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | 558 o | rev: 1, phase: draft |
559 |/ desc: mod a, phase: draft | 559 |/ desc: mod a |
560 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | 560 o rev: 0, phase: draft |
561 desc: initial, phase: draft | 561 desc: initial |
562 $ ls | 562 $ ls |
563 c | 563 c |
564 $ cd .. | 564 $ cd .. |
565 $ rm -rf repo | 565 $ rm -rf repo |
566 | 566 |
579 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 579 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
580 $ hg mv a b | 580 $ hg mv a b |
581 $ hg ci -m 'mv a b' | 581 $ hg ci -m 'mv a b' |
582 | 582 |
583 $ hg l | 583 $ hg l |
584 @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | 584 @ rev: 1 |
585 | desc: mv a b | 585 | desc: mv a b |
586 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | 586 o rev: 0 |
587 desc: initial | 587 desc: initial |
588 $ hg unshelve | 588 $ hg unshelve |
589 unshelving change 'default' | 589 unshelving change 'default' |
590 rebasing shelved changes | 590 rebasing shelved changes |
591 merging b and a to b | 591 merging b and a to b |
592 $ ls | 592 $ ls |
616 $ echo b >> a | 616 $ echo b >> a |
617 $ cd .. | 617 $ cd .. |
618 $ hg ci -qm 'mod a' | 618 $ hg ci -qm 'mod a' |
619 | 619 |
620 $ hg pl | 620 $ hg pl |
621 @ changeset: 6207d2d318e710b882e3d5ada2a89770efc42c96 | 621 @ rev: 2, phase: draft |
622 | desc: mod a, phase: draft | 622 | desc: mod a |
623 | o changeset: abffdd4e3dfc04bc375034b970299b2a309a1cce | 623 | o rev: 1, phase: draft |
624 |/ desc: mv a b; mv dir1 dir2, phase: draft | 624 |/ desc: mv a b; mv dir1 dir2 |
625 o changeset: 81973cd24b58db2fdf18ce3d64fb2cc3284e9ab3 | 625 o rev: 0, phase: draft |
626 desc: initial, phase: draft | 626 desc: initial |
627 | 627 |
628 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 | 628 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 |
629 rebasing 2:6207d2d318e7 "mod a" (tip) | 629 rebasing 2:6207d2d318e7 "mod a" (tip) |
630 merging dir2/b and dir1/a to dir2/b | 630 merging dir2/b and dir1/a to dir2/b |
631 saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg | 631 saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg |
654 $ hg up -q '.^' | 654 $ hg up -q '.^' |
655 $ hg mv -q dir1 dir2 | 655 $ hg mv -q dir1 dir2 |
656 $ hg ci -qm 'mv dir1 dir2' | 656 $ hg ci -qm 'mv dir1 dir2' |
657 | 657 |
658 $ hg pl | 658 $ hg pl |
659 @ changeset: e8919e7df8d036e07b906045eddcd4a42ff1915f | 659 @ rev: 2, phase: draft |
660 | desc: mv dir1 dir2, phase: draft | 660 | desc: mv dir1 dir2 |
661 | o changeset: 7c7c6f339be00f849c3cb2df738ca91db78b32c8 | 661 | o rev: 1, phase: draft |
662 |/ desc: hg add dir1/a, phase: draft | 662 |/ desc: hg add dir1/a |
663 o changeset: a235dcce55dcf42034c4e374cb200662d0bb4a13 | 663 o rev: 0, phase: draft |
664 desc: initial, phase: draft | 664 desc: initial |
665 | 665 |
666 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 | 666 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 |
667 rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip) | 667 rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip) |
668 saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg | 668 saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg |
669 $ ls dir2 | 669 $ ls dir2 |
687 $ hg ci -Aqm "added b" | 687 $ hg ci -Aqm "added b" |
688 $ mkdir foo | 688 $ mkdir foo |
689 $ hg mv a foo/bar | 689 $ hg mv a foo/bar |
690 $ hg ci -m "Moved a to foo/bar" | 690 $ hg ci -m "Moved a to foo/bar" |
691 $ hg pl | 691 $ hg pl |
692 @ changeset: b4b0f7880e500b5c364a5f07b4a2b167de7a6fb0 | 692 @ rev: 3, phase: draft |
693 | desc: Moved a to foo/bar, phase: draft | 693 | desc: Moved a to foo/bar |
694 o changeset: 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d | 694 o rev: 2, phase: draft |
695 | desc: added b, phase: draft | 695 | desc: added b |
696 | o changeset: 8b6e13696c38e8445a759516474640c2f8dddef6 | 696 | o rev: 1, phase: draft |
697 |/ desc: added more things to a, phase: draft | 697 |/ desc: added more things to a |
698 o changeset: 9092f1db7931481f93b37d5c9fbcfc341bcd7318 | 698 o rev: 0, phase: draft |
699 desc: added a, phase: draft | 699 desc: added a |
700 | 700 |
701 When the sourcecommitlimit is small and we have more drafts, we use heuristics only | 701 When the sourcecommitlimit is small and we have more drafts, we use heuristics only |
702 | 702 |
703 $ hg rebase -s 8b6e13696 -d . | 703 $ hg rebase -s 1 -d . |
704 rebasing 1:8b6e13696c38 "added more things to a" | 704 rebasing 1:8b6e13696c38 "added more things to a" |
705 file 'a' was deleted in local [dest] but was modified in other [source]. | 705 file 'a' was deleted in local [dest] but was modified in other [source]. |
706 What do you want to do? | 706 What do you want to do? |
707 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 707 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
708 unresolved conflicts (see hg resolve, then hg rebase --continue) | 708 unresolved conflicts (see hg resolve, then hg rebase --continue) |
711 But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do | 711 But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do |
712 fullcopytracing | 712 fullcopytracing |
713 | 713 |
714 $ hg rebase --abort | 714 $ hg rebase --abort |
715 rebase aborted | 715 rebase aborted |
716 $ hg rebase -s 8b6e13696 -d . --config experimental.copytrace.sourcecommitlimit=100 | 716 $ hg rebase -s 1 -d . --config experimental.copytrace.sourcecommitlimit=100 |
717 rebasing 1:8b6e13696c38 "added more things to a" | 717 rebasing 1:8b6e13696c38 "added more things to a" |
718 merging foo/bar and a to foo/bar | 718 merging foo/bar and a to foo/bar |
719 saved backup bundle to $TESTTMP/repo/repo/repo/.hg/strip-backup/8b6e13696c38-fc14ac83-rebase.hg | 719 saved backup bundle to $TESTTMP/repo/repo/repo/.hg/strip-backup/8b6e13696c38-fc14ac83-rebase.hg |
720 $ cd .. | 720 $ cd .. |
721 $ rm -rf repo | 721 $ rm -rf repo |