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

RE: Re: Conflict file naming

From: Gale, David <David.Gale_at_Hypertherm.com>
Date: 2006-01-05 17:35:51 CET

John Peacock wrote:
> kfogel@collab.net wrote:
>> Frankly, I don't think we even need a config control for this -- it
>> ought to be the default behavior.
> What heuristic are you proposing to use as to when the file extension
> is "significant" (i.e. denotes some specific file format) and when it
> isn't? Or are you thinking that the conflict filename will simply
> strip off the last filename component, insert the conflict
> extension(s), then re-add the previous terminal component?
> John

And, what about files that don't have an extension? Or files that begin
with a . (say, .bashrc)?

Also, the current system ensures that the three files are as close as
possible in an alphabetical listing. Putting the conflict extensions in
the middle breaks that behavior, which is probably not a good thing.

In other words, I'm against making this change, or at least against
making it the default. If it's an option, it's one I'd probably leave
turned off.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 5 18:28:57 2006

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

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