Mercurial > hg
diff tests/test-mv-cp-st-diff.out @ 6336:4b0c9c674707
warn about new heads on commit (issue842)
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Fri, 21 Mar 2008 11:06:02 +0100 |
| parents | 90a4329a6b4a |
| children | 2d9328a2f81f |
line wrap: on
line diff
--- a/tests/test-mv-cp-st-diff.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-mv-cp-st-diff.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,3 +1,4 @@ +created new head ** rename in working dir ** ** add a a1 / add a a2 / hg mv a b - working to parent: @@ -96,6 +97,7 @@ +m2 +created new head ** copy in working dir ** ** add a a1 / add a a2 / hg cp a b - working to parent: @@ -211,6 +213,7 @@ +m2 +created new head ** single rename ** ** hg mv a b / add b b1 / add b w - working to parent: @@ -324,6 +327,7 @@ +m2 +created new head ** single copy ** ** hg cp a b / add b b1 / add a w - working to parent: @@ -472,6 +476,7 @@ -b1 +created new head ** rename chain ** ** hg mv a b / hg mv b c / hg mv c d - working to parent: @@ -574,6 +579,7 @@ +m2 +created new head ** copy chain ** ** hg cp a b / hg cp b c / hg cp c d - working to parent: @@ -793,6 +799,7 @@ -5 +created new head ** circular rename ** ** add a a1 / hg mv a b / hg mv b a - working to parent: