"SteveKing" <steveking@gmx.ch> wrote:
>
> ----- Original Message -----
> From: "Ben Collins-Sussman" <sussman@collab.net>
> > >
> > > 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
>
> Thanks for your help. Seems I have to investigate it
> further with the one who reported it.
> (see
http://tortoisesvn.tigris.org/servlets/ReadMsg?list=dev&msgNo=1621)
>
> Stefan
I reported it since my svn 0.29 on win2k produced .working file instead
of .mine after I did a merge that resulted in a conflict. I investigated
it some more and it seems that a conflict on update produces an .mine
file while a conflict on a merge produces an .working file. I thought I
had read something about it on the subversion list and assumed that
noone had updated tortoise but that was my mistake. But any kind of
conflict should lead to the same set of files, shouldn't it?
/Michael
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 11 14:29:02 2003