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

Re: Conflict file naming

From: Paul Koning <pkoning_at_equallogic.com>
Date: 2006-01-05 17:25:02 CET

>>>>> "John" == John Peacock <jpeacock@rowman.com> writes:

 John> kfogel@collab.net wrote:
>> Frankly, I don't think we even need a config control for this --
>> it ought to be the default behavior.

 John> What heuristic are you proposing to use as to when the file
 John> extension is "significant" (i.e. denotes some specific file
 John> format) and when it isn't? Or are you thinking that the
 John> conflict filename will simply strip off the last filename
 John> component, insert the conflict extension(s), then re-add the
 John> previous terminal component?

That seems like a reasonable way to go, provided the part preceding
the extension is not null. In other words, "dot files" should be
handled as they are today.


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:13:47 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.