Mercurial > hg
diff tests/test-subrepo.t @ 18605:bcf29565d89f
manifestmerge: pass in branchmerge and force separately
This will be used in an upcoming patch.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 08 Feb 2013 15:23:23 +0000 |
parents | 8113077f84e0 |
children | 0b6e6eacc939 |
line wrap: on
line diff
--- a/tests/test-subrepo.t Sat Feb 09 15:43:02 2013 +0000 +++ b/tests/test-subrepo.t Fri Feb 08 15:23:23 2013 +0000 @@ -203,7 +203,7 @@ $ hg merge 6 --debug # test change searching for copies back to rev 2 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 .hgsubstate: versions differ -> m updating: .hgsubstate 1/1 files (100.00%) @@ -212,7 +212,7 @@ getting subrepo t searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: False, force: False, partial: False ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a t: remote is newer -> g updating: t 1/1 files (100.00%) @@ -232,7 +232,7 @@ $ HGMERGE=internal:merge hg merge --debug 7 # test conflict searching for copies back to rev 2 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf .hgsubstate: versions differ -> m updating: .hgsubstate 1/1 files (100.00%) @@ -241,7 +241,7 @@ merging subrepo t searching for copies back to rev 2 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 t: versions differ -> m preserving t for resolve of t