> At 4:07 AM -0500 2/12/04, m0llbuz_ wrote: > > > ><<<<< foo.html > >===== > > > >>>>>> 1.2.2.1 > > While I find this annoying, it is really the correct thing to do. > Right now I am writing a lot of Python code and it is perfectly > reasonable to change the white space inside a multi-line string. So > unless cvs is going to do detailed semantic analysis based on the > file type (and determining that is a sticky problem all by itself), > this is what it should be doing.
I agree this should be it's default behaviour, but I wish there was a flag for disabling conflict reports when only white space lines are involved. I work with Perl scripts and HTML templates, and white space lines are not very serious there. > >I also get weird conflicts during merges where the diffs are exactly the same. > > > ><<<<< foo.pm > >foo > >===== > >foo > >>>>>> 1.2.2.1 > > I've seen this too. Are there white space differences? Or were the > two lines adde in different branches? Or are you doing multiple > merges from the base of a branch (without a bookmark)? I have examined the diffs closely and no white spaces differ. In one example there were no white spaces at all, like in the above example. No carriage returns. > >I even get weird conflicts like this (slightly simplified): > > > ><<<<< foo.pm > >foo > >===== > > > >>>>>> 1.2.2.1 > ><<<<< foo.pm > > > >===== > >foo > > >>>>> 1.2.2.1 > > IIRC, the diff logic that cvs uses has some goofy things like this in > it, with windows of around 10 lines or so. This was discussed a few > years back and at the time the comments were along the lines of "I am > not smart enough to fix this, and the person who does is too busy." > No idea if it has improved since then. Maybe a line was added higher up in one of the files so the row "foo" was no longer on the same line, but really the diff logic should understand this? Thanks for the help! Kloper -- ___________________________________________________________ Sign-up for Ads Free at Mail.com http://promo.mail.com/adsfreejump.htm _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
