Mike Matrigali wrote:
In my svn commit of 329494, when I went to merge it
to the branch I got a conflict on every line of the change -
all eol issues.
My questions are:
1) did I just get unlucky with my timing vs. the recent eol mass change?
2) Did I do something wrong with my original checkin, or something with
the merge command (kathy tried the merge and got the same conficts)?
3) Is this going to happen with all future trunk to branch merges?
By the way, GNU patch is able to recognize newline changes. What patch
program do people use on Windows?
Is there any way to control how svn does diffing and patching when
invoking the merge subcommand?
--
Oyvind Bakksjo
Sun Microsystems, Database Technology Group
Trondheim, Norway
http://weblogs.java.net/blog/bakksjo/
