Mercurial > hg
view tests/test-diff-issue2761.t @ 16794:98687cdddcb1
merge: warn about file deleted in one branch and renamed in other (issue3074)
For divergent renames the following message is printed during merge:
note: possible conflict - file was renamed multiple times to:
newfile
file2
When a file is renamed in one branch and deleted in the other, the file still
exists after a merge. With this change a similar message is printed for mv+rm:
note: possible conflict - file was deleted and renamed to:
newfile
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 23 May 2012 20:50:16 +0200 |
parents | cff56a0ed18e |
children | 73e3e368bd42 |
line wrap: on
line source
Test issue2761 $ hg init $ touch to-be-deleted $ hg add adding to-be-deleted $ hg ci -m first $ echo a > to-be-deleted $ hg ci -m second $ rm to-be-deleted $ hg diff -r 0 Same issue, different code path $ hg up -C 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ touch doesnt-exist-in-1 $ hg add adding doesnt-exist-in-1 $ hg ci -m third $ rm doesnt-exist-in-1 $ hg diff -r 1