Hi Alan,
> -----Original Message----- > From: Alan W. Irwin [mailto:ir...@beluga.phys.uvic.ca] > > I was about to answer your off-list post to me concerning this issue, but > taking this > conversation to the list at this stage is a good idea so I will answer you > here instead. > ... > > What happens with a fresh start if you try "git am --keep-cr"? I mentioned > this > possibility off-list before, but as far as I can tell you have not tried it > yet. > > That seems to be the universal advice about what option should be used on > Windows platforms with "git am" _even when communicating between Windows > platforms_. In the current context of communicating from my Unix platform to > your > Windows platform I am hoping that what --keep-cr actually does is > automatically > transform the LF patch context lines and changed lines in my series of > patches to > CRLF before applying. > I tried that on my current working directory and private branch: same messages as before. I will try the "fresh start" approach later. The curious thing is that it also produces error messages on files that I have not changed in any way for this branch. These files are being moved to a temporary "old" directory. Oh well, let's wait for the "fresh start" approach to either work or fail. > If that doesn't work, another possibility to try (starting with a fresh > start) is to run my > patch series through a utility to convert all line endings in the patch file > to CRLF > before you attempt to use "git am --keep-cr". I cannot see how that method > could > possibly fail.... (Famous last words. :-) ) > > But if neither of those ideas work, I will try a question to the git list > since surely there > must be a method of working with "git format-patch"/"git am" that allows > collaboration > between developers on Windows and Unix platforms with all line endings issues > automatically taken care of. > A complication might be that I am using git via Cygwin and Cygwin expects shell scripts to be in UNIX format (LF line endings). IIRC, Cygwin allows either format. You have to chose at installation time. Regards, Arjen DISCLAIMER: This message is intended exclusively for the addressee(s) and may contain confidential and privileged information. If you are not the intended recipient please notify the sender immediately and destroy this message. Unauthorized use, disclosure or copying of this message is strictly prohibited. The foundation 'Stichting Deltares', which has its seat at Delft, The Netherlands, Commercial Registration Number 41146461, is not liable in any way whatsoever for consequences and/or damages resulting from the improper, incomplete and untimely dispatch, receipt and/or content of this e-mail.
------------------------------------------------------------------------------
_______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
