[Bug 3985] New: qpush and file with mixed EOL

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Wed Jul 17 21:32:22 CDT 2013


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

          Priority: normal
            Bug ID: 3985
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: qpush and file with mixed EOL
          Severity: bug
    Classification: Unclassified
                OS: All
          Reporter: grebenschikov at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.6.3
         Component: mq
           Product: Mercurial

Created attachment 1733
  --> http://bz.selenic.com/attachment.cgi?id=1733&action=edit
test file

I find a problem with patches if file have mixed EOL.
I test with 2.6.3 version.

Enabled extensions:
    mq            manage a stack of patches


How to reproduce:

P:\test>hg init

P:\test>hg add
adding test.html

P:\test>hg commit

P:\test>del test.html

P:\test>hg addremove
removing test.html

P:\test>hg qnew test.patch

P:\test>hg qpop
popping test.patch
patch queue now empty

P:\test>hg qpush
applying test.patch
patching file test.html
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file test.html.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh test.patch

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


More information about the Mercurial-devel mailing list