Mercurial > hg
view tests/README @ 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 | 1de6e7e1bb9f |
children | 4b0fc75f9403 |
line wrap: on
line source
To run the tests, do: cd tests/ python run-tests.py See http://mercurial.selenic.com/wiki/WritingTests for more information on writing tests.