On Mon, 16 Sep 2013, Ulrich Wilkens wrote:
> On 09/15/13 05:55, Jon Trulson wrote:
>>
>> Hi, this one fails to apply:
>>
>> error: patch failed:
>> cde/imports/motif/localized/de_DE.ISO8859-1/msg/Xm.msg:717
[...]
>
> Hmm, I think the patch is correct. But it contains many whitespaces at
> end of lines and also lines with only whitespaces. They are important
> and cannot be removed before applying the patch.
> Though it looks like they were removed! Either by the email program or
> by a pre-commit hook that you may have installed.
> I have attached the same patch again but this time it is gzipped. That
> should avoid removal of trailing whitespaces by the mailer.
> Please make sure that your git configuration doesn't remove the trailing
> spaces of this patch.
>
Yes, I did disable the 'auto-whitespace fix' option in git before
attempting to apply it.
The compressed one you sent applied correctly though - I am assuming
that a mailer messed it up along the way.
> P.S.: There must have been a similar problem a few months ago when you
> substituted empty comment lines '$' in message files with '$ '.
Yeah, I did disable git's whitespace fixing for that, just as a
precaution.
I did not make the comment changes ('$ ') to dtinfo or (I think) dtksh
msg files at the time since they were non-functional, which is
probably why you needed to do them. Sorry :)
--
Jon Trulson
"I was not genomed to alter reality."
- Sonmi 451
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
