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

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

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-06-12 21:15:48 CEST

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.

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

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 12 21:16:17 2002

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