equal
deleted
inserted
replaced
539 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
539 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
540 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
540 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
541 @@ -0,0 +1,2 @@ |
541 @@ -0,0 +1,2 @@ |
542 +d |
542 +d |
543 +blah |
543 +blah |
|
544 |
|
545 $ cd .. |
|
546 |
|
547 Rebase, collapse and copies |
|
548 |
|
549 $ hg init copies |
|
550 $ cd copies |
|
551 $ hg unbundle "$TESTDIR/bundles/renames.hg" |
|
552 adding changesets |
|
553 adding manifests |
|
554 adding file changes |
|
555 added 4 changesets with 11 changes to 7 files (+1 heads) |
|
556 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
557 $ hg up -q tip |
|
558 $ hg tglog |
|
559 @ 3: 'move2' |
|
560 | |
|
561 o 2: 'move1' |
|
562 | |
|
563 | o 1: 'change' |
|
564 |/ |
|
565 o 0: 'add' |
|
566 |
|
567 $ hg rebase --collapse -d 1 |
|
568 merging a and d to d |
|
569 merging b and e to e |
|
570 merging c and f to f |
|
571 merging e and g to g |
|
572 merging f and c to c |
|
573 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob) |
|
574 $ hg st |
|
575 $ hg st --copies --change . |
|
576 A d |
|
577 a |
|
578 A g |
|
579 b |
|
580 R b |
|
581 $ cat c |
|
582 c |
|
583 c |
|
584 $ cat d |
|
585 a |
|
586 a |
|
587 $ cat g |
|
588 b |
|
589 b |
|
590 $ hg log -r . --template "{file_copies}\n" |
|
591 d (a)g (b) |
|
592 $ cd .. |