Re: filename extensions of conflicted files

"SteveKing" <steveking@gmx.ch> writes:

> That once was. But I'm not sure it still is. I found while browsing the
> source two possibilities:
> /libsvn_client/diff.c, line 603 ff : .merge-left.r%, .merge-right.r%
> but in
> libsvn_subr/io.c, line 1270 ff: .old, .new
>
> Someone with a deep insight?

Those are only templates anyway, the final suffix used may differ
depending on what files exist in the working copy. You should use
svn_wc_entry to get the conflict file names, take a look at the code
for 'svn info'.

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