Show More
@@ -491,3 +491,64 b' Try merging the other direction too' | |||||
491 | $ hg debugpathcopies 0 5 |
|
491 | $ hg debugpathcopies 0 5 | |
492 | x -> z |
|
492 | x -> z | |
493 |
|
493 | |||
|
494 | ||||
|
495 | Test for a case in fullcopytracing algorithm where both the merging csets are | |||
|
496 | "dirty"; where a dirty cset means that cset is descendant of merge base. This | |||
|
497 | test reflect that for this particular case this algorithm correctly find the copies: | |||
|
498 | ||||
|
499 | $ cat >> $HGRCPATH << EOF | |||
|
500 | > [experimental] | |||
|
501 | > evolution.createmarkers=True | |||
|
502 | > evolution.allowunstable=True | |||
|
503 | > EOF | |||
|
504 | ||||
|
505 | $ newrepo | |||
|
506 | $ echo a > a | |||
|
507 | $ hg add a | |||
|
508 | $ hg ci -m "added a" | |||
|
509 | $ echo b > b | |||
|
510 | $ hg add b | |||
|
511 | $ hg ci -m "added b" | |||
|
512 | ||||
|
513 | $ hg mv b b1 | |||
|
514 | $ hg ci -m "rename b to b1" | |||
|
515 | ||||
|
516 | $ hg up ".^" | |||
|
517 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
518 | $ echo d > d | |||
|
519 | $ hg add d | |||
|
520 | $ hg ci -m "added d" | |||
|
521 | created new head | |||
|
522 | ||||
|
523 | $ echo baba >> b | |||
|
524 | $ hg ci --amend -m "added d, modified b" | |||
|
525 | ||||
|
526 | $ hg l --hidden | |||
|
527 | @ 4 added d, modified b | |||
|
528 | | b d | |||
|
529 | | x 3 added d | |||
|
530 | |/ d | |||
|
531 | | o 2 rename b to b1 | |||
|
532 | |/ b b1 | |||
|
533 | o 1 added b | |||
|
534 | | b | |||
|
535 | o 0 added a | |||
|
536 | a | |||
|
537 | ||||
|
538 | Grafting revision 4 on top of revision 2, showing that it respect the rename: | |||
|
539 | ||||
|
540 | $ hg up 2 -q | |||
|
541 | $ hg graft -r 4 --base 3 --hidden | |||
|
542 | grafting 4:af28412ec03c "added d, modified b" (tip) | |||
|
543 | merging b1 and b to b1 | |||
|
544 | ||||
|
545 | $ hg l -l1 -p | |||
|
546 | @ 5 added d, modified b | |||
|
547 | | b1 | |||
|
548 | ~ diff -r 5a4825cc2926 -r 94a2f1a0e8e2 b1 | |||
|
549 | --- a/b1 Thu Jan 01 00:00:00 1970 +0000 | |||
|
550 | +++ b/b1 Thu Jan 01 00:00:00 1970 +0000 | |||
|
551 | @@ -1,1 +1,2 @@ | |||
|
552 | b | |||
|
553 | +baba | |||
|
554 |
General Comments 0
You need to be logged in to leave comments.
Login now