[Bug 3915] New: hg export generates invalid patches for changed casing

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Mon Apr 29 17:28:03 CDT 2013


http://bz.selenic.com/show_bug.cgi?id=3915

          Priority: normal
            Bug ID: 3915
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: hg export generates invalid patches for changed casing
          Severity: bug
    Classification: Unclassified
                OS: Windows
          Reporter: cowwoc at bbs.darktech.org
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.5.2
         Component: Mercurial
           Product: Mercurial

Created attachment 1724
  --> http://bz.selenic.com/attachment.cgi?id=1724&action=edit
The patch created by the export operation

Mercurial 2.5.2

1. I've got a changeset that consists of two rename operations:

hg rename merchant.js Merchant.js
hg rename utilities.js Utilities.js

2. I exported this changeset using "hg export -r 16 -o rename.patch"
3. If I "hg import rename.patch" from changeset 15 I get the following error:

file server/web/src/main/webapp/js/Merchant.js already exists
1 out of 1 hunks FAILED -- saving rejects to file
server/web/src/main/webapp/js/
Merchant.js.rej
file server/web/src/main/webapp/js/Utilities.js already exists
1 out of 1 hunks FAILED -- saving rejects to file
server/web/src/main/webapp/js/
Utilities.js.rej
abort: patch failed to apply

4. I believe the patch contains a mistake in that files are being added before
being removed.

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list