[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: <kfogel_at_collab.net>
Date: 2006-01-05 16:37:38 CET

John Peacock <jpeacock@rowman.com> writes:
> 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?

That's exactly what I was thinking. To be precise:

If a filename has any dot, then insert ".FOO" before the last dot,
where "FOO" is the Subversion-specific bit ("mine", "r64", whatever).

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 5 19:05:12 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.