Mercurial > hg
comparison tests/test-graft.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 | 4d61c847e06c |
comparison
equal
deleted
inserted
replaced
| 27160:c533435cbc37 | 27161:296d55def9c4 |
|---|---|
| 152 resolving manifests | 152 resolving manifests |
| 153 branchmerge: True, force: True, partial: False | 153 branchmerge: True, force: True, partial: False |
| 154 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 | 154 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
| 155 preserving b for resolve of b | 155 preserving b for resolve of b |
| 156 b: local copied/moved from a -> m (premerge) | 156 b: local copied/moved from a -> m (premerge) |
| 157 picked tool ':merge' for b (binary False symlink False) | 157 picked tool ':merge' for b (binary False symlink False changedelete False) |
| 158 merging b and a to b | 158 merging b and a to b |
| 159 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 | 159 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 |
| 160 premerge successful | 160 premerge successful |
| 161 committing files: | 161 committing files: |
| 162 b | 162 b |
| 182 preserving e for resolve of e | 182 preserving e for resolve of e |
| 183 d: remote is newer -> g | 183 d: remote is newer -> g |
| 184 getting d | 184 getting d |
| 185 b: remote unchanged -> k | 185 b: remote unchanged -> k |
| 186 e: versions differ -> m (premerge) | 186 e: versions differ -> m (premerge) |
| 187 picked tool ':merge' for e (binary False symlink False) | 187 picked tool ':merge' for e (binary False symlink False changedelete False) |
| 188 merging e | 188 merging e |
| 189 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 | 189 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
| 190 e: versions differ -> m (merge) | 190 e: versions differ -> m (merge) |
| 191 picked tool ':merge' for e (binary False symlink False) | 191 picked tool ':merge' for e (binary False symlink False changedelete False) |
| 192 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 | 192 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
| 193 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | 193 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 194 abort: unresolved conflicts, can't continue | 194 abort: unresolved conflicts, can't continue |
| 195 (use hg resolve and hg graft --continue) | 195 (use hg resolve and hg graft --continue) |
| 196 [255] | 196 [255] |