Re: filename extensions of conflicted files

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

> > 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.
>
> actually, I was told that the "foo.mine" is now "foo.working".

Nope.

[sussman@kepler:~/scratch/wc2]$ svn up
C iota
Updated to revision 3.

[sussman@kepler:~/scratch/wc2]$ ls
A/ iota iota.mine iota.r2 iota.r3

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 10 19:01:06 2003