http://bugs.grommit.com/show_bug.cgi?id=404
Summary: mercurial issue 819: no conflict reported when merging
conflicting file types
Product: SCM Migration
Version: unspecified
Platform: All
OS/Version: Solaris 11/Nevada
Status: NEW
Severity: normal
Priority: P3
Component: mercurial
AssignedTo: scm-migration-dev at opensolaris.org
ReportedBy: richlowe at richlowe.net
http://www.selenic.com/mercurial/bts/issue819
If one branch makes a file executable, and another makes it a symlink, when
merging the two the symlink always wins.
I'm not sure to what degree we would care about this (given we don't much like
files controlled as executable), feel free to drop the priority.
--
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.
