Mercurial > public > mercurial-scm > hg-stable
diff tests/test-up-local-change.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 | 5ed6a375e9ca |
| children | e2dc5397bc82 |
line wrap: on
line diff
--- a/tests/test-up-local-change.t Sat Feb 09 15:43:02 2013 +0000 +++ b/tests/test-up-local-change.t Fri Feb 08 15:23:23 2013 +0000 @@ -44,7 +44,7 @@ unmatched files in other: b resolving manifests - overwrite: False, partial: False + branchmerge: False, force: False, partial: False ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb a: versions differ -> m preserving a for resolve of a @@ -65,7 +65,7 @@ $ hg --debug up 0 resolving manifests - overwrite: False, partial: False + branchmerge: False, force: False, partial: False ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a b: other deleted -> r a: versions differ -> m @@ -98,7 +98,7 @@ unmatched files in other: b resolving manifests - overwrite: False, partial: False + branchmerge: False, force: False, partial: False ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb a: versions differ -> m preserving a for resolve of a @@ -176,7 +176,7 @@ $ hg --debug merge -f searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: True, partial: False ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 a: versions differ -> m preserving a for resolve of a