From: Greg C. <chi...@co...> - 2005-10-11 01:24:19
|
On 2005-10-10 23:14 UTC, Lennart Borgman wrote: > Leif W wrote: > >> (condensed, rearranged) >> >> >>>>>>> From: Lennart Borgman <len...@st...> >>>>>>> Received: Mon, 10 Oct 2005 09:48:06 AM EDT >>>>>>> >>>>>>> I am looking into the possibility to change and recompile the >>>>>>> diffutils that comes with MSYS so that they treat lines on w32 as >>>>>>> just lines (CR-LF or just LF should not matter by default). This >>>>>>> is (as most of you surely know by now) the solution that GnuWin32 >>>>>>> has choosen. >>>>>>> >>>>> >>>>> Greg Chicares wrote: >>>>> >>>>> Glancing back at that thread ("Line endings and MSYS diff"), it looks >>>>> like this: >>>>> >>>>> 4) Treat \n and \r\n as different unless some special switch is >>>>> applied was the consensus. >>>>> >>>> >>>> Lennart Borgman wrote: >>>> >>>> My vote was not on that alternative. It creates unnecessary >>>> difficulties I believe. >>>> >>> >>> From: Lennart Borgman <len...@st...> >>> Received: Mon, 10 Oct 2005 01:28:50 PM EDT >>> >>> I have made my vote a little bit more concrete now by turning >> >> >> Heh, funny, you don't like the consensus so you make a "concrete" vote, >> somehow overrides consensus, or counts as 2+ votes? Everyone can go >> back and >> forth forever here and never agree, so maybe we need to approach >> another way? >> >> > Eh, no, not really ;-) > > There was no consensus. I disagree. Let's examine the facts. Here's how I count the responses to Earnie's question [1] (let me know if I haven't fairly represented anyone's POV): On 2005-8-5 15:06 UTC, Max T. Woodbury wrote: dislikes 2 and 5 On 2005-8-5 15:25 UTC, Larry Berlinski wrote: likes 4 and 6 On 2005-8-5 15:35 UTC, Greg Chicares wrote: likes 1; OK with 4; dislikes 2 and 3 On 2005-8-5 16:30 UTC, Leif W wrote: likes 1 or 4; OK with 6 On 2005-8-5 17:05 UTC, Duncan Murdoch wrote: suggests 1 or 4 On 2005-8-5 19:59 UTC, Tuomo Latto wrote: prefers 3 or 4 [but would probably like 3 better, I think] On 2005-8-5 21:44 UTC, John Vandenberg wrote: likes 1; OK with 4; dislikes 2, 3, and 5, and perhaps 6 On 2005-8-7 15:39 UTC, Ross Ridge wrote: I think this is a vote for 3 On 2005-8-7 16:45 UTC, Egon Andersen wrote: prefers 4 On 2005-8-7 17:07 UTC, Igor Mikolic-Torreira wrote: prefers 4 Of the ten respondents, eight are at least OK with #4, and four with #1. No other option was spoken of favorably by more than two. How can you say there wasn't consensus for #4? > I did not have time to express my view very > clearly at that time, unfortunately. I think a problem was that the > change I suggested was believed to break something, but it was unlclear > what. One reason for this is perhaps the lacks of tests suite for diff. > (At least I can not find any.) I think that our differing views could be > more clearly expressed if we nailed down as unit tests. I have therefore > made a unit test for this special case and uploaded it to the location I > mentioned before. What's lacking in Earnie's original testcase [1]? After rereading the August messages, I think the issues were carefully considered. Why not look back on that and consider proposing a change the community would support--or give a brief, convincing reason why most of us were wrong? --------- [1] Earnie's original message: On 2005-8-5 14:15 UTC, Earnie Boyd wrote: > Subject: Line endings and diff > > <file name="foo1.txt"> > foo\n > </file> > > <file name="foo2.txt"> > foo\r\n > </file> > > <command action="diff -u foo1.txt foo2.txt"> > <result> > --- foo1.txt Fri Aug 5 09:43:49 2005 > +++ foo2.txt Fri Aug 5 09:44:17 2005 > @@ -1 +1 @@ > -foo\n > +foo\r\n > </result> > </command> > > I've set up the above example to discuss what the Community would wish MSYS > diff to do in the above. Current MSYS diff executes as seen above and thus > works the same as if you were to execute the command on a UNIX OS. Others > have asked that \r\n be treated equivalent to \n even though in reality the > files are different. > > Options for change: > 1) No change. > 2) Treat \n and \r\n the same regardless** ***. > 3) Treat \n and \r\n the same unless some special switch is applied** ***. > 4) Treat \n and \r\n as different unless some special switch is applied* ** > ***. > 5) Supply a native version of diff instead of the MSYS diff***. > 6) Supply a native version of diff renamed to mingw32-diff***. > > * Current MSYS diff -w or -b will treat \r as white space but if you want > white space differences then this doesn't work well. > > ** If these changes are accomplished the output line endings would still > retain the line ending in the respective file if other differences are > found. Modifcations to patch may also need to happen. > > *** There is danger of introducing \r\n when the files do not contain them > originally if patch is used to apply the difference elsewhere. > > The people having the most problems are those using native tools that spawn > MSYS processes. Another place where the current MSYS diff presents a > problem is when doing the unit tests when a comparison file is used to find > a regression (such as is used by GNU make). > > So, I'm looking for ideas and suggestions. |