http://bugs.grommit.com/show_bug.cgi?id=459
Summary: Mercurial issue 1052: diff -g copy handling is oddly
filename dependent
Product: SCM Migration
Version: unspecified
Platform: All
URL: http://www.selenic.com/mercurial/bts/issue1052
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
[this is an issue in 1.0, but not 0.9.5, tracked here because we need 1.0 for
other bug fixes, but should not use it until we have a fix for this, or
reasoning that suggests we don't need one]
Text from upstream bug:
diff -g's copy representation seems to be oddly dependent on the filename of
possible ancestors, after Hg fda369b5779c
It appears to pick the ancestor that sorts last, alphabetically by filename,
rather than the most direct ancestor, in at least some cases.
cp a b
commit
cp b otherfile
commit
cp otherfile somename
Will show otherfile -> somename, in both diff -g and status -C
However, if rather than 'b', one uses 'z', the copy will be z -> somename in
diff -g (but not status -C), contents changes are fixed up in the diff such
that
content is fine, only ancestry is incorrect.
--
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.
