Re: filename extensions of conflicted files

Philip Martin <philip@codematters.co.uk> writes:

> Update's .rX naming can be inconvenient for merge. Consider
>
> $ svn merge http://.../branch1/foo http://.../branch2/foo foo
> C foo
> $ ls
> foo
> foo.r1
> foo.1.r1
> foo.mine
>
> Does foo.r1 correspond to branch1/foo or branch2/foo?
>
> We have a system that allows the names to be different and we took
> advantage of that.

Ah, makes sense. Hence the "merge-left" and "merge-right" suffixes.
You've persuaded me that the status quo is good. Maybe we should
make 'svn merge' and 'svn up' at least agree on '.mine'
vs. '.working'?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 11 15:21:20 2003