Re: svn rollback (Was: Re: svn commit: rev 2162 - ...)

On Wed, Jun 12, 2002 at 08:15:48PM +0100, Philip Martin wrote:
> Garrett Rooney <rooneg@electricjellyfish.net> writes:
>
> > > My guess is that you either remove revision 5 to 7, or revision 5 to
> > > HEAD, from everything in the wc. If that's the case, it's not clear
> > > to me that it is correct.
> >
> > my current 'make it do what i think everyone else wanted' patch has it
> > doing a merge from the current working copy to the target rev and applying
> > it to the current working copy. so it actually rolls EVERYTHING back
> > to the revision you're asking for, including any local mods. i could
>
> Really? As far as I can tell, if the working copy is at a mixed
> revision there is no single merge command that will do this. The
> merge command takes two fixed revision numbers. To rollback a mixed
> revision working copy, one of the revision numbers has to be set on a
> per item basis.

there is an 'svn_client_revision_working' which means (according to
the header file) 'current, plus local mods'. i haven't pounded on
this much, but if you pass it to merge it should generate a diff
between what you have currently and whatever other revision you give
it.

/me crosses his finger since he hasn't delved too deeply into the code...

> > change that to be between head and the target rev, and i think that
> > should preserve local mods (or try to anyway).
>
> This won't work in general if the working copy is a mixed revision.

yeah, that wouldn't surprise me too much, although i wonder how merge
will deal with mixed revisions for 'svn_client_revision_working'...

-garrett

-- 
garrett rooney                    Remember, any design flaw you're 
rooneg@electricjellyfish.net      sufficiently snide about becomes  
http://electricjellyfish.net/     a feature.       -- Dan Sugalski
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org