Mercurial > hg
comparison tests/test-graft.t @ 30201:856ead835f56
checkcopies: handle divergences contained entirely in tca::ctx
During a graftlike merge, _checkcopies runs from ctx to tca, possibly
passing over the merge base. If there is a rename both before and after
the base, then we're actually dealing with divergent renames.
If there is no rename on the other side of tca, then the divergence is
contained entirely in the range of one _checkcopies invocation, and
should be detected "in the loop" without having to rely on the other
_checkcopies pass.
| author | Gábor Stefanik <gabor.stefanik@nng.com> |
|---|---|
| date | Wed, 12 Oct 2016 11:54:03 +0200 |
| parents | 0accd5a5ad04 |
| children | 1894c830ee74 |
comparison
equal
deleted
inserted
replaced
| 30200:a2804ddcf9ae | 30201:856ead835f56 |
|---|---|
| 980 | 980 |
| 981 Test the cases A.0 (f4x) and A.6 (f3x) | 981 Test the cases A.0 (f4x) and A.6 (f3x) |
| 982 | 982 |
| 983 $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit | 983 $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit |
| 984 grafting 3:b69f5839d2d9 "D0" | 984 grafting 3:b69f5839d2d9 "D0" |
| 985 note: possible conflict - f3b was renamed multiple times to: | |
| 986 f3d | |
| 987 f3a | |
| 985 warning: can't find ancestor for 'f3d' copied from 'f3b'! | 988 warning: can't find ancestor for 'f3d' copied from 'f3b'! |
| 986 | 989 |
| 987 Set up the repository for some further tests | 990 Set up the repository for some further tests |
| 988 | 991 |
| 989 $ hg up -q "min(desc("A0"))" | 992 $ hg up -q "min(desc("A0"))" |