Re: Conflict file naming

On Thu, 5 Jan 2006 [email protected] 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.

//Peter