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

Re: Rolling Back Changes

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-11-16 00:36:43 CET

On Sat, 2003-11-15 at 17:26, Dietrich Epp wrote:

> > Run 'svn log -r53 --verbose'. It will list the exact changes made in
> > r53. If you don't like the change, roll it back in your working copy,
> > and commit the "undo" as r54. Read chapter 4 in the book about how to
> > use 'svn merge' to do this.
>
> I was trying to roll back the change by copying the revision 52
> directory into its location.

'svn copy wc URL' and 'svn copy URL URL' won't overwrite things. That's
how we designed things. But 'svn copy URL wc' *should* overwrite
things, as long as they're scheduled for deletion. It's a regression
bug that we can't do that anymore. See issue #1516. I'm annoyed about
it.

> I couldn't reproduce the bug that wiped out my Resources directory.

It's bit presumptious to claim that it was an svn bug that deleted your
directory... especially since you have no idea how it happened. My
guess is that you're being smacked by the standard NeXTstep interface
builder problem: i.e. it's destroying and re-creating whole directories
without telling you.

> I don't want to deal with merging it. I just want to
> copy the files back into the directory.
>
> Anyway, I just rolled (with dump/load) back to rev 52 and I'm redoing
> the changes I made since then.

Let me get this straight: dumping and re-loading your whole repository
is 'easier' than a single 'svn merge -r53:52' command?

OK, whatever floats your boat. :-)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Nov 16 00:37:46 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.