[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: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2001-10-30 00:04:48 CET

Greg Stein <gstein@lyra.org> writes:
> User error :-)
>
> To remove a conflict, you must take specific action. That action is to
> remove the .rej (or .prej) file.

Some operations should do it for you.

All we ought to require is that the user express some kind of
intentionality about the conflict. These methods are all pretty clear
expressions of intention to resolve:

   removing the rej file
   reverting
   deleting/restoring the file

The reason they're all clear expressions of intention is that the
first blows away the repository's "suggested" changes, and the other
two blow away the user's conflicting changes. Either way, the user
has irrevocably expressed a resolution preference, so Subversion might
as well honor it. :-)

Issue #486 deals with the revert case, but I don't think there's any
issue for the specific scenario Daniel Stenberg encountered. Daniel,
would you care to file one?

-Karl

> 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

---------------------------------------------------------------------
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.