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

RE: Merge bug(let)

From: Sander Striker <striker_at_apache.org>
Date: 2003-02-26 15:28:02 CET

> From: Philip Martin
> Sent: Wednesday, February 26, 2003 2:13 PM

> Philip Martin <philip@codematters.co.uk> writes:
[...]
> Eeek! That's not right! Suppose we merge an old change where neither
> source has svn:eol-style into a working copy with svn:eol-style set to
> native. In that case we probably want it all done using native.
>
> How about this: if the merge changes the svn:eol-style then we use the
> new style (that of the new merge source) for all the files. If the
> merge doesn't change the svn:eol-style then we use the working copy
> svn:eol-style for all files.

Damn this is tricky. I was almost going to propose passing eol_str's to
the svn_diff[3]_file() fns, but it doesn't belong there IMHO.

> <Whisper>
> Or how about we abandon eol-conversion as a bad idea?
> </Whisper>

*grin* One can always keep trying ;) But I think you realise how important
a 'feature' our users regard this.

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Feb 26 15:28:50 2003

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