diff options
Diffstat (limited to 'tests/test-rename-merge2.t')
| -rw-r--r-- | tests/test-rename-merge2.t | 110 |
1 files changed, 54 insertions, 56 deletions
diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t index e5ba1d5..ba4a90b 100644 --- a/tests/test-rename-merge2.t +++ b/tests/test-rename-merge2.t @@ -80,12 +80,12 @@ $4 = expected result searching for copies back to rev 1 unmatched files in other: b - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b -> a * checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 + overwrite None partial False + ancestor 924404dff337 local e300d1c794ec+ remote 4ce40f5aca24 rev: versions differ -> m a: remote copied to b -> m preserving a for resolve of b @@ -115,12 +115,12 @@ $4 = expected result searching for copies back to rev 1 unmatched files in local: b - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b -> a * checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 + overwrite None partial False + ancestor 924404dff337 local 86a2aa42fc76+ remote f4db7e329e71 a: remote is newer -> g b: local copied/moved to a -> m rev: versions differ -> m @@ -153,12 +153,12 @@ $4 = expected result searching for copies back to rev 1 unmatched files in other: b - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b -> a * checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a + overwrite None partial False + ancestor 924404dff337 local e300d1c794ec+ remote bdb19105162a rev: versions differ -> m a: remote moved to b -> m preserving a for resolve of b @@ -188,12 +188,12 @@ $4 = expected result searching for copies back to rev 1 unmatched files in local: b - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b -> a * checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 + overwrite None partial False + ancestor 924404dff337 local 02963e448370+ remote f4db7e329e71 b: local copied/moved to a -> m rev: versions differ -> m preserving b for resolve of b @@ -222,12 +222,12 @@ $4 = expected result searching for copies back to rev 1 unmatched files in other: b - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b -> a checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 + overwrite None partial False + ancestor 924404dff337 local 94b33a1b7f2d+ remote 4ce40f5aca24 rev: versions differ -> m b: remote created -> g preserving rev for resolve of rev @@ -252,12 +252,12 @@ $4 = expected result searching for copies back to rev 1 unmatched files in local: b - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b -> a checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 + overwrite None partial False + ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336 rev: versions differ -> m preserving rev for resolve of rev updating: rev 1/1 files (100.00%) @@ -279,12 +279,12 @@ $4 = expected result searching for copies back to rev 1 unmatched files in other: b - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b -> a checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a + overwrite None partial False + ancestor 924404dff337 local 94b33a1b7f2d+ remote bdb19105162a a: other deleted -> r rev: versions differ -> m b: remote created -> g @@ -311,12 +311,12 @@ $4 = expected result searching for copies back to rev 1 unmatched files in local: b - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b -> a checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 + overwrite None partial False + ancestor 924404dff337 local 02963e448370+ remote 97c705ade336 rev: versions differ -> m preserving rev for resolve of rev updating: rev 1/1 files (100.00%) @@ -336,8 +336,8 @@ $4 = expected result -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 + overwrite None partial False + ancestor 924404dff337 local 62e7bf090eba+ remote 49b6d8032493 b: versions differ -> m rev: versions differ -> m preserving b for resolve of b @@ -369,14 +369,14 @@ m "um a c" "um x c" " " "10 do merge with no ancestor" b unmatched files in other: c - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): c -> a ! b -> a ! checking for directory renames a: divergent renames -> dr resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e + overwrite None partial False + ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e rev: versions differ -> m c: remote created -> g preserving rev for resolve of rev @@ -404,8 +404,8 @@ m "um a c" "um x c" " " "10 do merge with no ancestor" -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 + overwrite None partial False + ancestor 924404dff337 local 86a2aa42fc76+ remote af30c7647fc7 b: versions differ -> m rev: versions differ -> m preserving b for resolve of b @@ -432,8 +432,8 @@ m "um a c" "um x c" " " "10 do merge with no ancestor" -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a + overwrite None partial False + ancestor 924404dff337 local 59318016310c+ remote bdb19105162a a: other deleted -> r b: versions differ -> m rev: versions differ -> m @@ -462,8 +462,8 @@ m "um a c" "um x c" " " "10 do merge with no ancestor" -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a + overwrite None partial False + ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a a: remote is newer -> g b: versions differ -> m rev: versions differ -> m @@ -493,8 +493,8 @@ m "um a c" "um x c" " " "10 do merge with no ancestor" -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a + overwrite None partial False + ancestor 924404dff337 local 59318016310c+ remote bdb19105162a a: other deleted -> r b: versions differ -> m rev: versions differ -> m @@ -523,8 +523,8 @@ m "um a c" "um x c" " " "10 do merge with no ancestor" -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a + overwrite None partial False + ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a a: remote is newer -> g b: versions differ -> m rev: versions differ -> m @@ -554,8 +554,8 @@ m "um a c" "um x c" " " "10 do merge with no ancestor" -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 + overwrite None partial False + ancestor 924404dff337 local 0b76e65c8289+ remote 4ce40f5aca24 b: versions differ -> m rev: versions differ -> m preserving b for resolve of b @@ -582,8 +582,8 @@ m "um a c" "um x c" " " "10 do merge with no ancestor" -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a + overwrite None partial False + ancestor 924404dff337 local 02963e448370+ remote 8dbce441892a b: versions differ -> m rev: versions differ -> m remote changed a which local deleted @@ -615,8 +615,8 @@ m "um a c" "um x c" " " "10 do merge with no ancestor" -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a + overwrite None partial False + ancestor 924404dff337 local 0b76e65c8289+ remote bdb19105162a local changed a which remote deleted use (c)hanged version or (d)elete? c a: prompt keep -> a @@ -648,12 +648,12 @@ m "um a c" "um x c" " " "10 do merge with no ancestor" searching for copies back to rev 1 unmatched files in other: b - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b -> a * checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 + overwrite None partial False + ancestor 924404dff337 local e300d1c794ec+ remote 49b6d8032493 rev: versions differ -> m a: remote moved to b -> m preserving a for resolve of b @@ -682,12 +682,12 @@ m "um a c" "um x c" " " "10 do merge with no ancestor" searching for copies back to rev 1 unmatched files in local: b - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b -> a * checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 + overwrite None partial False + ancestor 924404dff337 local 62e7bf090eba+ remote f4db7e329e71 b: local copied/moved to a -> m rev: versions differ -> m preserving b for resolve of b @@ -720,12 +720,12 @@ m "nm a b" "um x a" " " "22 get a, keep b" b unmatched files in other: c - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): b -> a * checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f + overwrite None partial False + ancestor 924404dff337 local 02963e448370+ remote 2b958612230f b: local copied/moved to a -> m rev: versions differ -> m c: remote created -> g @@ -750,5 +750,3 @@ m "nm a b" "um x a" " " "22 get a, keep b" M c -------------- - - $ cd .. |