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

Re: Roll back version

From: Ryan Schmidt <subversion-2006c_at_ryandesign.com>
Date: 2006-08-25 14:02:56 CEST

On Aug 24, 2006, at 19:27, Tim Sublette wrote:

> We just implemented SVN in development (20+ developers) and ran
> into our first major “oops”. We adopted the standard Trunk,
> Branches, and tags directory structure and instructed people to
> checkout Trunk as their working copy. One developer checked out
> Root by mistake and then tried “clean up” the extra directories on
> their hard drive by deleting files through the Tortoise repository
> browser. To make a long story short, they deleted Trunk and
> Branches. The next person to commit changes obviously got an error
> say the archive did not exist.
> So basically the repository looked like the following
> Version User Msg
> ----------- -----------------
> ----------------------------------------
> 316 User XYZ Deleted Folder: Trunk
> 315 User XYZ Deleted Folder: Branches
> 314 User ABC … last valid commit …
> To fix this, I thought we would just “roll back” to version 314.
> Unfortunately, we had to choose from one of several work arounds
> such as:
> copy from Ver 314
> update to ver 314 and then commit back to the repository
> reverse merge.
> So my question is two fold: First, are the three ways I found to
> restore the directories generally accepted as standard? Second has
> a simple Roll back command been discussed as a possible feature?

Two of these ways work: you can either copy the directories from
revision 314, or you can do a reverse merge as Andrew showed. You
cannot commit from a revision that is not HEAD; you will get a
message that your working copy is out-of-date.

I don't think a simple rollback command would be the right thing to
implement. Imagine you discover this situation and intend to do a
rollback. Between the time you realize the problem and the time that
you execute the rollback command, 3 other people have committed
revisions 317, 318 and 319. Your rollback undoes those as well, and
nobody realizes that this has occurred. I also feel that there are
probably assumptions built into Subversion that the HEAD revision
only ever increases. So rather than roll back to a revision, which
has the above problems, you have the ability to undo specific
revisions, which is better.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 25 14:04:33 2006

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.