On 03.06.2008 03:33, TK Soh wrote: > On Mon, Jun 2, 2008 at 1:47 PM, <[EMAIL PROTECTED]> wrote: >> # HG changeset patch >> # User Peer Sommerlund <[EMAIL PROTECTED]> >> # Date 1212410722 -7200 >> # Node ID 674b8364a2cf1c46d2d0a3e501e2ea3eac71ca90 >> # Parent 4d6880646a6612c21f030cb722934cba9c18baa8 >> about: Make logo transparent >> >> The old 92x50 png was taken from the homepage, and has a white >> background. > > The patch failed to apply due to line termination problem. Can you > repost the patch as attachment? Thanks. >
I have problems applying the patch as well. > hg import peso.patch applying peso.patch patching file hggtk/about.py Hunk #1 FAILED at 60 1 out of 1 hunk FAILED -- saving rejects to file hggtk/about.py.rej abort: patch failed to apply I have copy/pasted the patch from the email to a file. If I save that with LF line endings I get above error. If I save that with CRLF line endings I get: > hg import peso.patch applying peso.patch abort: The filename, directory name, or volume label syntax is incorrect: W:\tortoisehg-crew\icons/tortoise/thg_logo.ico I suspect using patch transfers by email would be easier (if at all possible), if all sources would use consistent line ends. For example, thg crew tip hggtk/about.py uses CRLF line endings, whereas, for example, commit.py uses LF line endings. Other approaches might be to push changes to a publicly accessible repo or upload bundle files somewhere for downloading. ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
