Mercurial > hg
comparison tests/test-rename-merge1.t @ 12683:ada47c38f4e5
copies: don't detect copies as "divergent renames"
(For the purposes of this patch copy is defined as a rename where the
source continues to exist.)
| author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
|---|---|
| date | Sun, 10 Oct 2010 09:48:37 -0500 |
| parents | f254204d8b8d |
| children | 62c8f7691bc3 |
comparison
equal
deleted
inserted
replaced
| 12682:58a3e2608ae4 | 12683:ada47c38f4e5 |
|---|---|
| 73 1 67 72 1 3 4727ba907962 000000000000 57eacc201a7f | 73 1 67 72 1 3 4727ba907962 000000000000 57eacc201a7f |
| 74 | 74 |
| 75 $ hg debugrename b | 75 $ hg debugrename b |
| 76 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 | 76 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 |
| 77 | 77 |
| 78 This used to trigger a "divergent renames" warning, despite no renames | |
| 79 | |
| 80 $ hg cp b b3 | |
| 81 $ hg cp b b4 | |
| 82 $ hg ci -A -m 'copy b twice' | |
| 83 $ hg up eb92d88a9712 | |
| 84 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 85 $ hg up | |
| 86 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 87 $ hg rm b3 b4 | |
| 88 $ hg ci -m 'clean up a bit of our mess' | |
| 89 | |
| 90 We'd rather not warn on divergent renames done in the same changeset (issue2113) | |
| 91 | |
| 92 $ hg cp b b3 | |
| 93 $ hg mv b b4 | |
| 94 $ hg ci -A -m 'divergent renames in same changeset' | |
| 95 $ hg up c761c6948de0 | |
| 96 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 97 $ hg up | |
| 98 warning: detected divergent renames of b to: | |
| 99 b3 | |
| 100 b4 | |
| 101 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |