On Fri, 26 Oct 2001 08:12:59 +0200 (MET DST)
Daniel Stenberg <daniel@haxx.se> wrote:
> I think the *rej files are left in the tree too long. Or I might have gotten
> things wrong. Look at this:
>
> % ./svn st -u
> C 316 ./subversion/libsvn_wc/get_editor.c
>
> Ah, a C (because I did an update before that collided with a previous local
> patch). I check the diff:
>
> % ./svn diff subversion/libsvn_wc/get_editor.c
> %
>
> Ah, no difference. Ok, so let's remove my copy and get one from the repo:
>
> % rm subversion/libsvn_wc/get_editor.c
> % svn up
> Restored ./subversion/libsvn_wc/get_editor.c
>
> % svn st -u
> C 316 ./subversion/libsvn_wc/get_editor.c
>
> Hm, it is still C. Shouldn't restoring the one from the repo correct this?
> If not, how would the correct behavior on my part be?
A related thing I ran into was that a conflicted state would survive a svn revert
on the file. It seems like a revert should clear any conflict marker (the .rej file).
Mo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:46 2006