[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: *rej files left after restoring

From: Greg Stein <gstein_at_lyra.org>
Date: 2001-10-28 02:15:41 CET

User error :-)

To remove a conflict, you must take specific action. That action is to
remove the .rej (or .prej) file.

Cheers,
-g

On Fri, Oct 26, 2001 at 08:12:59AM +0200, Daniel Stenberg 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?
>
> --
> Daniel Stenberg - http://daniel.haxx.se - +46-705-44 31 77
> ech`echo xiun|tr nu oc|sed 'sx\([sx]\)\([xoi]\)xo un\2\1 is xg'`ol
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
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

This is an archived mail posted to the Subversion Dev mailing list.