http://bugs.grommit.com/show_bug.cgi?id=301
Summary: Mercurial issue 636: merge may use the wrong file
contents for a file merge
Product: SCM Migration
Version: unspecified
Platform: All
OS/Version: Solaris 11/Nevada
Status: NEW
Severity: major
Priority: P2
Component: mercurial
AssignedTo: scm-migration-dev at opensolaris.org
ReportedBy: richlowe at richlowe.net
http://www.selenic.com/mercurial/bts/issue636
if parent copies a file and modifies both old and new, and local modifies its
copy, merge will double-merge the new copy (once before the copy, once after).
Mercurial issue has a better description, and test case.
--
Configure bugmail: http://bugs.grommit.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
