Re: filename extensions of conflicted files

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

> Hi,
>
> I just got told that subversion changed the filename extensions
> of conflicted files.

You mean, back in svn 0.17, last January? That's what the CHANGES
file says. It took you this long to notice? :-)

> I browsed through the sourcecode to find out the exact extensions
> (TortoiseSVN needs those to start a conflict editor program), but
> I'm not sure if I got it right. Also, it's not documented in the
> book - there's still the old names and extensions mentioned. I know
> that at least the *.mine changed to *.working.

The book is correct, I'm not sure what you're talking about. I'm
looking at chapter 3, 'resolving conflicts'.

If you get a textual conflict on file 'foo', you end up with conflict
markers in the working file, and three fulltexts: foo.mine, foo.rX,
foo.rY.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 10 18:42:48 2003