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

merge: refactor manifestmerge init to better report effective ancestor

--- a/tests/test-rename-merge2.out	Mon Jun 08 18:14:44 2009 -0500
+++ b/tests/test-rename-merge2.out	Mon Jun 08 18:14:44 2009 -0500
@@ -2,15 +2,15 @@
 --------------
 test L:up a   R:nc a b W:       - 1  get local a to b
 --------------
-resolving manifests
- overwrite None partial False
- ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
+resolving manifests
+ overwrite None partial False
+ ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
  rev: versions differ -> m
  a: remote copied to b -> m
 preserving a for resolve of b
@@ -34,15 +34,15 @@
 --------------
 test L:nc a b R:up a   W:       - 2  get rem change to a and b
 --------------
-resolving manifests
- overwrite None partial False
- ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
+resolving manifests
+ overwrite None partial False
+ ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71
  a: remote is newer -> g
  b: local copied/moved to a -> m
  rev: versions differ -> m
@@ -68,15 +68,15 @@
 --------------
 test L:up a   R:nm a b W:       - 3  get local a change to b, remove a
 --------------
-resolving manifests
- overwrite None partial False
- ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
+resolving manifests
+ overwrite None partial False
+ ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
  rev: versions differ -> m
  a: remote moved to b -> m
 preserving a for resolve of b
@@ -100,15 +100,15 @@
 --------------
 test L:nm a b R:up a   W:       - 4  get remote change to b
 --------------
-resolving manifests
- overwrite None partial False
- ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
+resolving manifests
+ overwrite None partial False
+ ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71
  b: local copied/moved to a -> m
  rev: versions differ -> m
 preserving b for resolve of b
@@ -131,15 +131,15 @@
 --------------
 test L:       R:nc a b W:       - 5  get b
 --------------
-resolving manifests
- overwrite None partial False
- ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a 
   checking for directory renames
+resolving manifests
+ overwrite None partial False
+ ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7
  rev: versions differ -> m
  b: remote created -> g
 preserving rev for resolve of rev
@@ -158,15 +158,15 @@
 --------------
 test L:nc a b R:       W:       - 6  nothing
 --------------
-resolving manifests
- overwrite None partial False
- ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a 
   checking for directory renames
+resolving manifests
+ overwrite None partial False
+ ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336
  rev: versions differ -> m
 preserving rev for resolve of rev
 picked tool 'python ../merge' for rev (binary False symlink False)
@@ -183,15 +183,15 @@
 --------------
 test L:       R:nm a b W:       - 7  get b
 --------------
-resolving manifests
- overwrite None partial False
- ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a 
   checking for directory renames
+resolving manifests
+ overwrite None partial False
+ ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b
  a: other deleted -> r
  rev: versions differ -> m
  b: remote created -> g
@@ -211,15 +211,15 @@
 --------------
 test L:nm a b R:       W:       - 8  nothing
 --------------
-resolving manifests
- overwrite None partial False
- ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a 
   checking for directory renames
+resolving manifests
+ overwrite None partial False
+ ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336
  rev: versions differ -> m
 preserving rev for resolve of rev
 picked tool 'python ../merge' for rev (binary False symlink False)
@@ -235,10 +235,10 @@
 --------------
 test L:um a b R:um a b W:       - 9  do merge with ancestor in a
 --------------
+  searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7
-  searching for copies back to rev 1
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
@@ -259,9 +259,6 @@
 --------------
 test L:nm a b R:nm a c W:       - 11 get c, keep b
 --------------
-resolving manifests
- overwrite None partial False
- ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2
   searching for copies back to rev 1
   unmatched files in local:
    b
@@ -272,6 +269,9 @@
    b -> a !
   checking for directory renames
  a: divergent renames -> dr
+resolving manifests
+ overwrite None partial False
+ ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2
  rev: versions differ -> m
  c: remote created -> g
 preserving rev for resolve of rev
@@ -293,10 +293,10 @@
 --------------
 test L:nc a b R:up b   W:       - 12 merge b no ancestor
 --------------
+  searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7
-  searching for copies back to rev 1
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
@@ -318,10 +318,10 @@
 --------------
 test L:up b   R:nm a b W:       - 13 merge b no ancestor
 --------------
+  searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
-  searching for copies back to rev 1
  a: other deleted -> r
  b: versions differ -> m
  rev: versions differ -> m
@@ -344,10 +344,10 @@
 --------------
 test L:nc a b R:up a b W:       - 14 merge b no ancestor
 --------------
+  searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
-  searching for copies back to rev 1
  a: remote is newer -> g
  b: versions differ -> m
  rev: versions differ -> m
@@ -371,10 +371,10 @@
 --------------
 test L:up b   R:nm a b W:       - 15 merge b no ancestor, remove a
 --------------
+  searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
-  searching for copies back to rev 1
  a: other deleted -> r
  b: versions differ -> m
  rev: versions differ -> m
@@ -397,10 +397,10 @@
 --------------
 test L:nc a b R:up a b W:       - 16 get a, merge b no ancestor
 --------------
+  searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
-  searching for copies back to rev 1
  a: remote is newer -> g
  b: versions differ -> m
  rev: versions differ -> m
@@ -424,10 +424,10 @@
 --------------
 test L:up a b R:nc a b W:       - 17 keep a, merge b no ancestor
 --------------
+  searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7
-  searching for copies back to rev 1
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
@@ -449,10 +449,10 @@
 --------------
 test L:nm a b R:up a b W:       - 18 merge b no ancestor
 --------------
+  searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a
-  searching for copies back to rev 1
  b: versions differ -> m
  rev: versions differ -> m
 remote changed a which local deleted
@@ -478,10 +478,10 @@
 --------------
 test L:up a b R:nm a b W:       - 19 merge b no ancestor, prompt remove a
 --------------
+  searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b
-  searching for copies back to rev 1
  local changed a which remote deleted
 use (c)hanged version or (d)elete? c
  a: prompt keep -> a
@@ -506,15 +506,15 @@
 --------------
 test L:up a   R:um a b W:       - 20 merge a and b to b, remove a
 --------------
-resolving manifests
- overwrite None partial False
- ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
+resolving manifests
+ overwrite None partial False
+ ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
  rev: versions differ -> m
  a: remote moved to b -> m
 preserving a for resolve of b
@@ -537,15 +537,15 @@
 --------------
 test L:um a b R:up a   W:       - 21 merge a and b to b
 --------------
-resolving manifests
- overwrite None partial False
- ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
+resolving manifests
+ overwrite None partial False
+ ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71
  b: local copied/moved to a -> m
  rev: versions differ -> m
 preserving b for resolve of b
@@ -567,9 +567,6 @@
 --------------
 test L:nm a b R:up a c W:       - 23 get c, keep b
 --------------
-resolving manifests
- overwrite None partial False
- ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f
   searching for copies back to rev 1
   unmatched files in local:
    b
@@ -578,6 +575,9 @@
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
+resolving manifests
+ overwrite None partial False
+ ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f
  b: local copied/moved to a -> m
  rev: versions differ -> m
  c: remote created -> g