Mercurial > hg
comparison tests/test-issue672.t @ 27161:296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Just like binary and symlink conflicts, change/delete conflicts influence the
tool picked.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 25 Nov 2015 14:25:26 -0800 |
| parents | 8e6d5b7317e6 |
| children | 8abd9f785030 |
comparison
equal
deleted
inserted
replaced
| 27160:c533435cbc37 | 27161:296d55def9c4 |
|---|---|
| 64 resolving manifests | 64 resolving manifests |
| 65 branchmerge: True, force: False, partial: False | 65 branchmerge: True, force: False, partial: False |
| 66 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 | 66 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
| 67 preserving 1a for resolve of 1a | 67 preserving 1a for resolve of 1a |
| 68 1a: local copied/moved from 1 -> m (premerge) | 68 1a: local copied/moved from 1 -> m (premerge) |
| 69 picked tool ':merge' for 1a (binary False symlink False) | 69 picked tool ':merge' for 1a (binary False symlink False changedelete False) |
| 70 merging 1a and 1 to 1a | 70 merging 1a and 1 to 1a |
| 71 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d | 71 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
| 72 premerge successful | 72 premerge successful |
| 73 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 73 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 74 (branch merge, don't forget to commit) | 74 (branch merge, don't forget to commit) |
| 87 branchmerge: True, force: False, partial: False | 87 branchmerge: True, force: False, partial: False |
| 88 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 | 88 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
| 89 preserving 1 for resolve of 1a | 89 preserving 1 for resolve of 1a |
| 90 removing 1 | 90 removing 1 |
| 91 1a: remote moved from 1 -> m (premerge) | 91 1a: remote moved from 1 -> m (premerge) |
| 92 picked tool ':merge' for 1a (binary False symlink False) | 92 picked tool ':merge' for 1a (binary False symlink False changedelete False) |
| 93 merging 1 and 1a to 1a | 93 merging 1 and 1a to 1a |
| 94 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d | 94 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d |
| 95 premerge successful | 95 premerge successful |
| 96 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 96 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 97 (branch merge, don't forget to commit) | 97 (branch merge, don't forget to commit) |