[Bug 3799] New: If a patch with binary diffs ends up with Windows line endings, Mercurial can't apply it

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Fri Feb 1 09:17:13 CST 2013


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

          Priority: normal
            Bug ID: 3799
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: If a patch with binary diffs ends up with Windows line
                    endings, Mercurial can't apply it
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: benjamin at smedbergs.us
          Hardware: PC
            Status: UNCONFIRMED
           Version: unspecified
         Component: Mercurial
           Product: Mercurial

I don't exactly know how the patch file ended up with Windows line endings
(perhaps that's the default?). But the symptom is "Bad base85 character at
position 66". This is because in patch.py binhunk.read it's using line[1:-1].
It should probably just be stripping the line instead, unless it's possible to
have whitespace in the binary data.

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


More information about the Mercurial-devel mailing list