Mercurial > hg
comparison tests/test-merge-types.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 | 7a8e9a985c3b |
| children | 4ab69be0ea15 |
comparison
equal
deleted
inserted
replaced
| 27160:c533435cbc37 | 27161:296d55def9c4 |
|---|---|
| 34 resolving manifests | 34 resolving manifests |
| 35 branchmerge: True, force: False, partial: False | 35 branchmerge: True, force: False, partial: False |
| 36 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c | 36 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
| 37 preserving a for resolve of a | 37 preserving a for resolve of a |
| 38 a: versions differ -> m (premerge) | 38 a: versions differ -> m (premerge) |
| 39 picked tool ':merge' for a (binary False symlink True) | 39 picked tool ':merge' for a (binary False symlink True changedelete False) |
| 40 merging a | 40 merging a |
| 41 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da | 41 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da |
| 42 warning: internal :merge cannot merge symlinks for a | 42 warning: internal :merge cannot merge symlinks for a |
| 43 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 43 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 44 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 44 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 67 resolving manifests | 67 resolving manifests |
| 68 branchmerge: True, force: False, partial: False | 68 branchmerge: True, force: False, partial: False |
| 69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f | 69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
| 70 preserving a for resolve of a | 70 preserving a for resolve of a |
| 71 a: versions differ -> m (premerge) | 71 a: versions differ -> m (premerge) |
| 72 picked tool ':union' for a (binary False symlink True) | 72 picked tool ':union' for a (binary False symlink True changedelete False) |
| 73 merging a | 73 merging a |
| 74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da | 74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
| 75 warning: internal :union cannot merge symlinks for a | 75 warning: internal :union cannot merge symlinks for a |
| 76 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 76 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 90 resolving manifests | 90 resolving manifests |
| 91 branchmerge: True, force: False, partial: False | 91 branchmerge: True, force: False, partial: False |
| 92 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f | 92 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
| 93 preserving a for resolve of a | 93 preserving a for resolve of a |
| 94 a: versions differ -> m (premerge) | 94 a: versions differ -> m (premerge) |
| 95 picked tool ':merge3' for a (binary False symlink True) | 95 picked tool ':merge3' for a (binary False symlink True changedelete False) |
| 96 merging a | 96 merging a |
| 97 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da | 97 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
| 98 warning: internal :merge3 cannot merge symlinks for a | 98 warning: internal :merge3 cannot merge symlinks for a |
| 99 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 99 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 100 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 100 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 113 resolving manifests | 113 resolving manifests |
| 114 branchmerge: True, force: False, partial: False | 114 branchmerge: True, force: False, partial: False |
| 115 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f | 115 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
| 116 preserving a for resolve of a | 116 preserving a for resolve of a |
| 117 a: versions differ -> m (premerge) | 117 a: versions differ -> m (premerge) |
| 118 picked tool ':merge-local' for a (binary False symlink True) | 118 picked tool ':merge-local' for a (binary False symlink True changedelete False) |
| 119 merging a | 119 merging a |
| 120 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da | 120 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
| 121 warning: internal :merge-local cannot merge symlinks for a | 121 warning: internal :merge-local cannot merge symlinks for a |
| 122 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 122 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 123 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 123 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 135 resolving manifests | 135 resolving manifests |
| 136 branchmerge: True, force: False, partial: False | 136 branchmerge: True, force: False, partial: False |
| 137 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f | 137 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
| 138 preserving a for resolve of a | 138 preserving a for resolve of a |
| 139 a: versions differ -> m (premerge) | 139 a: versions differ -> m (premerge) |
| 140 picked tool ':merge-other' for a (binary False symlink True) | 140 picked tool ':merge-other' for a (binary False symlink True changedelete False) |
| 141 merging a | 141 merging a |
| 142 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da | 142 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
| 143 warning: internal :merge-other cannot merge symlinks for a | 143 warning: internal :merge-other cannot merge symlinks for a |
| 144 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 144 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 145 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 145 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 168 branchmerge: False, force: False, partial: False | 168 branchmerge: False, force: False, partial: False |
| 169 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f | 169 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f |
| 170 preserving a for resolve of a | 170 preserving a for resolve of a |
| 171 a: versions differ -> m (premerge) | 171 a: versions differ -> m (premerge) |
| 172 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) | 172 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) |
| 173 picked tool ':prompt' for a (binary False symlink True) | 173 picked tool ':prompt' for a (binary False symlink True changedelete False) |
| 174 no tool found to merge a | 174 no tool found to merge a |
| 175 keep (l)ocal or take (o)ther? l | 175 keep (l)ocal or take (o)ther? l |
| 176 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 176 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 177 $ hg diff --git | 177 $ hg diff --git |
| 178 diff --git a/a b/a | 178 diff --git a/a b/a |