[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: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-02-25 21:03:19 CET

"Sander Striker" <striker@apache.org> writes:

> 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.

Yes, at present merge occurs using all three files in
repository-normal form, which involves translating the working copy
file to repository-normal form before merging.

> My take is that we need to do it before (but not the keyword
> expansion).
> Thoughts? Better insights?

Interesting idea. Would it mean that the merge might behave
differently on different platforms? I don't suppose that's really a
problem, even if it does happen.

Note that the three files could each have svn:eol-style set to a
different value. Would you use the the setting appropriate for each
file or would you pick one, the working copy most probably, and use
that for all the files?

Philip - still thinks eol conversion has no place in version control
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 25 21:04:12 2003

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