[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: Peter N. Lundblad <peter_at_famlundblad.se>
Date: 2006-01-05 20:35:46 CET

On Thu, 5 Jan 2006 kfogel@collab.net wrote:

> I too thought we had an issue for this, but I can't find any. Yes,
> please file an enhancement-request issue (pointing to this thread).
> Frankly, I don't think we even need a config control for this -- it
> ought to be the default behavior.
The only problem I see is when the file extension itself contains a
preiod, but I think the major issue, namely keeping the file extensions in
most cases, is more important than the minor problem of splitting e.g.
"tar.gz" into "tar.mine.gz".

> Although of course, any examples in the book(s) and FAQ will need to
> be updated if we change this behavior. Mmm, and worse, some programs
> might be depending on it. In other words, the current practice of
> putting the Subversion-specific extension on the end might be
> considered an API of sorts.
We never guarantee that foo will have a conflict name of foo.mine, since
we might add a number in between to make the name unique. That's another
way to say what CMike already pointed out, I guess:-)

I think this is a good idea.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 5 21:36:15 2006

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.