Re: filename extensions of conflicted files

Ben Collins-Sussman <sussman@collab.net> writes:

> If you look at libsvn_wc/update_editor.c:install_file(), it's passing
> suffixes of {.mine, .rX, .rY} to the loggy call to svn_wc_merge().
>
> But then in libsvn_client/diff.c:merge_file_changed(), we're passing
> suffixes of {.working, .merge-left.rX, .merge-right.rY} to the same
> function.
>
> Why aren't we being consistent?

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.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org