[Bug 3648] New: case folding collision with a changeset removing a directory and adding it back with a name with a different case
bugzilla-daemon at bz.selenic.com
bugzilla-daemon at bz.selenic.com
Thu Oct 4 23:43:46 UTC 2012
http://bz.selenic.com/show_bug.cgi?id=3648
Priority: normal
Bug ID: 3648
CC: mercurial-devel at selenic.com
Assignee: bugzilla at selenic.com
Summary: case folding collision with a changeset removing a
directory and adding it back with a name with a
different case
Severity: bug
Classification: Unclassified
OS: Mac OS
Reporter: ehsan at mozilla.com
Hardware: PC
Status: UNCONFIRMED
Version: 2.2.3
Component: Mercurial
Product: Mercurial
Steps to reproduce (on Mac or Windows):
1. Clone https://bitbucket.org/ehsan/broken-inbound
2. Pull http://hg.mozilla.org/mozilla-central/
3. hg merge
You'll see an error message like this:
case-folding collision between
media/webrtc/trunk/src/modules/audio_coding/codecs/iSAC/fix/source/filterbank_tables.c
and
media/webrtc/trunk/src/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.c
We had to strip the offending changeset (d81b605dc8d8) from our repository
today to work around this.
Please refer to my blog post
<http://ehsanakhgari.org/blog/2012-10-04/renaming-directories-in-mercurial-by-just-changing-the-case>
for more details, and let me know if you have questions. Thanks!
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list