diff tests/test-rename-dir-merge.out @ 8753:af5f099d932b

merge: refactor manifestmerge init to better report effective ancestor

--- a/tests/test-rename-dir-merge.out	Mon Jun 08 18:14:44 2009 -0500
+++ b/tests/test-rename-dir-merge.out	Mon Jun 08 18:14:44 2009 -0500
@@ -5,9 +5,6 @@
 moving a/b to b/b
 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 created new head
-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
@@ -22,6 +19,9 @@
   dir a/ -> b/
   file a/c -> b/c
   file a/d -> b/d
+resolving manifests
+ overwrite None partial False
+ ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
  a/d: remote renamed directory to b/d -> d
  a/c: remote renamed directory to b/c -> d
  a/b: other deleted -> r
@@ -47,9 +47,6 @@
 ? b/d
 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-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
@@ -63,6 +60,9 @@
   checking for directory renames
   dir a/ -> b/
   file a/c -> b/c
+resolving manifests
+ overwrite None partial False
+ ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
  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