Mercurial > hg-stable
comparison tests/test-double-merge.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 | 18adc15635a1 |
comparison
equal
deleted
inserted
replaced
| 18604:a1141f04e368 | 18605:bcf29565d89f |
|---|---|
| 31 bar | 31 bar |
| 32 all copies found (* = to merge, ! = divergent, % = renamed and deleted): | 32 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
| 33 src: 'foo' -> dst: 'bar' * | 33 src: 'foo' -> dst: 'bar' * |
| 34 checking for directory renames | 34 checking for directory renames |
| 35 resolving manifests | 35 resolving manifests |
| 36 overwrite: False, partial: False | 36 branchmerge: True, force: False, partial: False |
| 37 ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 | 37 ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 |
| 38 foo: remote copied to bar -> m | 38 foo: remote copied to bar -> m |
| 39 preserving foo for resolve of bar | 39 preserving foo for resolve of bar |
| 40 foo: versions differ -> m | 40 foo: versions differ -> m |
| 41 preserving foo for resolve of foo | 41 preserving foo for resolve of foo |