Mercurial > hg
comparison tests/test-up-local-change.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 | 6b1fc09c699a |
comparison
equal
deleted
inserted
replaced
| 27160:c533435cbc37 | 27161:296d55def9c4 |
|---|---|
| 48 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb | 48 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
| 49 preserving a for resolve of a | 49 preserving a for resolve of a |
| 50 b: remote created -> g | 50 b: remote created -> g |
| 51 getting b | 51 getting b |
| 52 a: versions differ -> m (premerge) | 52 a: versions differ -> m (premerge) |
| 53 picked tool 'true' for a (binary False symlink False) | 53 picked tool 'true' for a (binary False symlink False changedelete False) |
| 54 merging a | 54 merging a |
| 55 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | 55 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
| 56 a: versions differ -> m (merge) | 56 a: versions differ -> m (merge) |
| 57 picked tool 'true' for a (binary False symlink False) | 57 picked tool 'true' for a (binary False symlink False changedelete False) |
| 58 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | 58 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
| 59 launching merge tool: true *$TESTTMP/r2/a* * * (glob) | 59 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
| 60 merge tool returned: 0 | 60 merge tool returned: 0 |
| 61 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 61 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 62 $ hg parents | 62 $ hg parents |
| 72 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a | 72 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
| 73 preserving a for resolve of a | 73 preserving a for resolve of a |
| 74 b: other deleted -> r | 74 b: other deleted -> r |
| 75 removing b | 75 removing b |
| 76 a: versions differ -> m (premerge) | 76 a: versions differ -> m (premerge) |
| 77 picked tool 'true' for a (binary False symlink False) | 77 picked tool 'true' for a (binary False symlink False changedelete False) |
| 78 merging a | 78 merging a |
| 79 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb | 79 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
| 80 a: versions differ -> m (merge) | 80 a: versions differ -> m (merge) |
| 81 picked tool 'true' for a (binary False symlink False) | 81 picked tool 'true' for a (binary False symlink False changedelete False) |
| 82 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb | 82 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
| 83 launching merge tool: true *$TESTTMP/r2/a* * * (glob) | 83 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
| 84 merge tool returned: 0 | 84 merge tool returned: 0 |
| 85 0 files updated, 1 files merged, 1 files removed, 0 files unresolved | 85 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
| 86 $ hg parents | 86 $ hg parents |
| 104 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb | 104 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
| 105 preserving a for resolve of a | 105 preserving a for resolve of a |
| 106 b: remote created -> g | 106 b: remote created -> g |
| 107 getting b | 107 getting b |
| 108 a: versions differ -> m (premerge) | 108 a: versions differ -> m (premerge) |
| 109 picked tool 'true' for a (binary False symlink False) | 109 picked tool 'true' for a (binary False symlink False changedelete False) |
| 110 merging a | 110 merging a |
| 111 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | 111 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
| 112 a: versions differ -> m (merge) | 112 a: versions differ -> m (merge) |
| 113 picked tool 'true' for a (binary False symlink False) | 113 picked tool 'true' for a (binary False symlink False changedelete False) |
| 114 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | 114 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
| 115 launching merge tool: true *$TESTTMP/r2/a* * * (glob) | 115 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
| 116 merge tool returned: 0 | 116 merge tool returned: 0 |
| 117 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 117 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 118 $ hg parents | 118 $ hg parents |