diff options
Diffstat (limited to 'tests/test-rename-dir-merge.t')
| -rw-r--r-- | tests/test-rename-dir-merge.t | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/tests/test-rename-dir-merge.t b/tests/test-rename-dir-merge.t index b115c26..c66318b 100644 --- a/tests/test-rename-dir-merge.t +++ b/tests/test-rename-dir-merge.t @@ -11,8 +11,8 @@ $ hg co -C 0 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg mv a b - moving a/a to b/a (glob) - moving a/b to b/b (glob) + moving a/a to b/a + moving a/b to b/b $ hg ci -m "1 mv a/ b/" $ hg co -C 0 @@ -27,38 +27,43 @@ searching for copies back to rev 1 unmatched files in local: a/c + a/d unmatched files in other: b/a b/b - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b/a -> a/a b/b -> a/b checking for directory renames dir a/ -> b/ file a/c -> b/c + file a/d -> b/d resolving manifests - overwrite: False, partial: False - ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 + overwrite None partial False + ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740 + a/d: remote renamed directory to b/d -> d a/c: remote renamed directory to b/c -> d a/b: other deleted -> r a/a: other deleted -> r b/a: remote created -> g b/b: remote created -> g - updating: a/a 1/5 files (20.00%) + updating: a/a 1/6 files (16.67%) removing a/a - updating: a/b 2/5 files (40.00%) + updating: a/b 2/6 files (33.33%) removing a/b - updating: a/c 3/5 files (60.00%) + updating: a/c 3/6 files (50.00%) moving a/c to b/c - updating: b/a 4/5 files (80.00%) + updating: a/d 4/6 files (66.67%) + moving a/d to b/d + updating: b/a 5/6 files (83.33%) getting b/a - updating: b/b 5/5 files (100.00%) + updating: b/b 6/6 files (100.00%) getting b/b - 3 files updated, 0 files merged, 2 files removed, 0 files unresolved + 4 files updated, 0 files merged, 2 files removed, 0 files unresolved (branch merge, don't forget to commit) $ echo a/* b/* - a/d b/a b/b b/c + a/* b/a b/b b/c b/d $ hg st -C M b/a M b/b @@ -67,10 +72,10 @@ R a/a R a/b R a/c - ? a/d + ? b/d $ hg ci -m "3 merge 2+1" $ hg debugrename b/c - b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob) + b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 $ hg co -C 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -79,17 +84,18 @@ unmatched files in local: b/a b/b + b/d unmatched files in other: a/c - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b/a -> a/a b/b -> a/b checking for directory renames dir a/ -> b/ file a/c -> b/c resolving manifests - overwrite: False, partial: False - ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb + overwrite None partial False + ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb None: local renamed directory to b/c -> d updating:None 1/1 files (100.00%) getting a/c to b/c @@ -97,15 +103,15 @@ (branch merge, don't forget to commit) $ echo a/* b/* - a/d b/a b/b b/c + a/* b/a b/b b/c b/d $ hg st -C A b/c a/c - ? a/d + ? b/d $ hg ci -m "4 merge 1+2" created new head $ hg debugrename b/c - b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob) + b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 Second scenario with two repos: @@ -116,7 +122,7 @@ Second scenario with two repos: $ mkdir a $ echo foo > a/f $ hg add a - adding a/f (glob) + adding a/f $ hg ci -m "a/f == foo" $ cd .. @@ -125,7 +131,7 @@ Second scenario with two repos: 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd r2 $ hg mv a b - moving a/f to b/f (glob) + moving a/f to b/f $ echo foo1 > b/f $ hg ci -m" a -> b, b/f == foo1" $ cd .. @@ -134,7 +140,7 @@ Second scenario with two repos: $ mkdir a/aa $ echo bar > a/aa/g $ hg add a/aa - adding a/aa/g (glob) + adding a/aa/g $ hg ci -m "a/aa/g" $ hg pull ../r2 pulling from ../r2 @@ -155,5 +161,3 @@ Second scenario with two repos: a/aa/g R a/aa/g R a/f - - $ cd .. |