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

RE: eol style differences

From: Sander Striker <striker_at_apache.org>
Date: 2003-03-11 22:41:53 CET

> From: Greg Hudson [mailto:ghudson@MIT.EDU]
> Sent: Tuesday, March 11, 2003 10:37 PM

> On Tue, 2003-03-11 at 16:32, Sander Striker wrote:
>> Wouldn't that screw up context in diffs? [it might contain the expanded
>> keywords]
>
> That depends on whether you think it's "screwed up" to have an expanded
> keyword in the context.

I don't care ;)

> Certainly, if you produce a context diff and then try to apply it to a
> different working copy, you'll get a conflict. But a collapsed keyword
> would also generate a conflict.

Hmmm, true. Either way gives a conflict, and given we don't have an internal
patch to handle this... disregard my comment. Your suggestion seems the
way to go.

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 11 22:42:37 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.