[Bug 5126] New: Binary file renamed on one branch and changed on other causes unwarranted conflict on merge
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Fri Mar 4 16:59:48 UTC 2016
https://bz.mercurial-scm.org/show_bug.cgi?id=5126
Bug ID: 5126
Summary: Binary file renamed on one branch and changed on other
causes unwarranted conflict on merge
Product: Mercurial
Version: 3.5.2
Hardware: PC
OS: Windows
Status: UNCONFIRMED
Severity: bug
Priority: normal
Component: Mercurial
Assignee: bugzilla at selenic.com
Reporter: gabor.stefanik at nng.com
CC: mercurial-devel at selenic.com
If I rename a binary file on one branch, and change it on the other, then try
to merge between these branches, Hg tries and fails to perform a 3-way file
merge, even though there is really nothing to merge, as the file hasn't changed
on the rename branch.
An unnecessary 3-way merge is also called for text files in this case, but at
least that's not fatal, only a performance issue.
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list