Mercurial > hg
diff tests/test-rename-dir-merge.out @ 5371:17ed9b9a0d03
merge: add debug diagnostics for findcopies
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 04 Oct 2007 19:44:37 -0500 |
parents | dee573ba79f1 |
children | 56e9f7b2d8fa |
line wrap: on
line diff
--- a/tests/test-rename-dir-merge.out Wed Oct 03 17:17:28 2007 -0500 +++ b/tests/test-rename-dir-merge.out Thu Oct 04 19:44:37 2007 -0500 @@ -9,6 +9,18 @@ resolving manifests overwrite None partial False ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80 + searching for copies back to rev 1 + unmatched files in local: + a/c + unmatched files in other: + b/a + b/b + 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 a/c: remote renamed directory to b/c -> d a/b: other deleted -> r a/a: other deleted -> r @@ -34,6 +46,18 @@ resolving manifests overwrite None partial False ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb + searching for copies back to rev 1 + unmatched files in local: + b/a + b/b + unmatched files in other: + a/c + 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 None: local renamed directory to b/c -> d getting a/c to b/c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved