Mercurial > hg

comparison tests/test-merge-commit.t @ 18605:bcf29565d89f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 cb15835456cb
comparison
equal deleted inserted replaced
18604:a1141f04e368 18605:bcf29565d89f
67 This should use bar@rev2 as the ancestor: 67 This should use bar@rev2 as the ancestor:
68 68
69 $ hg --debug merge 3 69 $ hg --debug merge 3
70 searching for copies back to rev 1 70 searching for copies back to rev 1
71 resolving manifests 71 resolving manifests
72 overwrite: False, partial: False 72 branchmerge: True, force: False, partial: False
73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
74 bar: versions differ -> m 74 bar: versions differ -> m
75 preserving bar for resolve of bar 75 preserving bar for resolve of bar
76 updating: bar 1/1 files (100.00%) 76 updating: bar 1/1 files (100.00%)
77 picked tool 'internal:merge' for bar (binary False symlink False) 77 picked tool 'internal:merge' for bar (binary False symlink False)
154 This should use bar@rev2 as the ancestor: 154 This should use bar@rev2 as the ancestor:
155 155
156 $ hg --debug merge 3 156 $ hg --debug merge 3
157 searching for copies back to rev 1 157 searching for copies back to rev 1
158 resolving manifests 158 resolving manifests
159 overwrite: False, partial: False 159 branchmerge: True, force: False, partial: False
160 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 160 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
161 bar: versions differ -> m 161 bar: versions differ -> m
162 preserving bar for resolve of bar 162 preserving bar for resolve of bar
163 updating: bar 1/1 files (100.00%) 163 updating: bar 1/1 files (100.00%)
164 picked tool 'internal:merge' for bar (binary False symlink False) 164 picked tool 'internal:merge' for bar (binary False symlink False)