[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: Dietrich Epp <dietrich_at_zdome.net>
Date: 2003-11-16 01:16:17 CET

On Nov 15, 2003, at 3:36 PM, Ben Collins-Sussman wrote:

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

There wasn't anything to overwrite.

>> 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 consider it a problem in Interface Builder. It's just
something that Interface Builder does that Subversion doesn't
understand yet. Someday:

svn propset svn:volatile yes *.nib

And I didn't say it was a bug in subversion... but you saw what I
typed, and you saw what it did. For all I know it was a memory error.
All I know is that a directory with a handful of files suddenly had
only one after I committed.

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

Well, right now I just want to fix the bug that causes my application
to crash when it quits. I know how to copy from old revisions and I
know how to dump and load. I don't want to learn how subversion
handles merging today. Maybe after I fix my bug. It took me mere
moments to make Subversion forget about revisions 53 & 54, then copy
the changes back in. It's not a huge repository -- most of the changes
are in the archived CVS repository. So, yes it was easier than
learning which command to use to merge.

Anyway, I'm content with my repository as it is.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Nov 16 01:16:55 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.