[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Getting started on the release -- one more thing though...

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2003-02-25 20:20:38 CET

"Sander Striker" <striker@apache.org> writes:
> WTF? No conflicts. Upon investigation of
> subversion/libsvn_wc/merge.c I saw that we are trying to merge 3
> conflicting files and then we leave 3 non conflicting files in the
> wc. The reason the 3 files we try to merge conflict is because we
> aren't doing eol translation prior to running merge (is my guess).
> We are doing that _after_ we see the conflict. My take is that we
> need to do it before (but not the keyword expansion).
> Thoughts? Better insights?

Let me back up to another question:

Did the internal diff lib behave differently than a merge using
external diff would have behaved?

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 25 20:54:58 2003

This is an archived mail posted to the Subversion Dev mailing list.