equal
deleted
inserted
replaced
569 overwriting with renames (issue1959) |
569 overwriting with renames (issue1959) |
570 |
570 |
571 $ hg rename d1/a d1/c |
571 $ hg rename d1/a d1/c |
572 $ hg rename d1/b d1/a |
572 $ hg rename d1/b d1/a |
573 $ hg status -C |
573 $ hg status -C |
574 A d1/a |
574 M d1/a |
575 d1/b |
575 d1/b |
576 A d1/c |
576 A d1/c |
577 d1/a |
577 d1/a |
578 R d1/b |
578 R d1/b |
579 $ hg diff --git |
579 $ hg diff --git |
580 diff --git a/d1/b b/d1/a |
580 diff --git a/d1/a b/d1/a |
581 rename from d1/b |
581 --- a/d1/a |
582 rename to d1/a |
582 +++ b/d1/a |
|
583 @@ -1,1 +1,1 @@ |
|
584 -d1/a |
|
585 +d1/b |
|
586 diff --git a/d1/b b/d1/b |
|
587 deleted file mode 100644 |
|
588 --- a/d1/b |
|
589 +++ /dev/null |
|
590 @@ -1,1 +0,0 @@ |
|
591 -d1/b |
583 diff --git a/d1/a b/d1/c |
592 diff --git a/d1/a b/d1/c |
584 copy from d1/a |
593 copy from d1/a |
585 copy to d1/c |
594 copy to d1/c |
586 $ hg update -C |
595 $ hg update -C |
587 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
596 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |