tags:

views:

12496

answers:

13

I messed up on my SVN repository and now need to revert the entire repository from revision 28 to 24 and don't want to deal with diffs or conflicts. Is there a quick and simple way to do this? I've been able to revert back single files before fine with the merge command - but in this instance it wants to add all of the files back into the repository from revision 28 when all I really want to do is delete them.

I am using the command line on a linux box (bash).

Thanks

EDIT

Thanks for all of the help! I fixed it by:

svnadmin create /svnroot/<repo>.fixed
svnadmin dump -r 1:24 /svnroot/<repo> --incremental > dump.svn
svnadmin load /svnroot/<repo>.fixed < dump.svn

Then putting the old repo in a backup location and moving the repo.fixed to repo.

Thanks again!

+1  A: 

You can do a new checkout of a particular revision. http://svnbook.red-bean.com/en/1.1/re04.html

svn co path/to/my/repo -r 24
nickf
I have done that already, but it refuses to commit back to the repository as a new revision. Is it possible to do that? I.e. make revision 29 to a copy of revision 24?
nlaq
Yes. The svn copy command can do repo -> repo copies. Check "svn help copy" for the exact syntax.
JesperE
A: 

Quoting first answer:

I have done that already, but it refuses to commit back to the repository as a new revision. Is it possible to do that? I.e. make revision 29 to a copy of revision 24?

nlaq
+12  A: 

A "reverse" merge may be what you need. See "undoing changes" section of svn book.

E.g. svn merge -r 28:24 [path to svn]

luapyad
It does not delete the files that were created in 28. The problem is I added a bunch of files that I shouldn't of. Yes, I really screwed up. Manually chasing down what needs to be removed is out of the question. I just want to "delete" every reversion after 24.
nlaq
Sorry - I must not quite have understood your problem. I have used the reverse merge to get rid of newly (but incorrectly) added files on several occasions...(but your case must be slight different?)(You cant normally delete revisions from the svn repo - only add new ones that repair the mistakes).
luapyad
+1  A: 

I hate to say this, but that is a situation where I've found myself using backups of my svn repository.

Can you copy files of a certain revision to a new directory within the repository?

Backup SVN sounds silly it itself, but it sounds like that is something I should of done in the first place :/
nlaq
I've had svn repositories get corrupted, and it is not fun.I do backups frequently and put copies in a safe deposit box at the bank.
Backing up is a good practice, but restoring from backup in this situation shouldn't be necessary.
Sander Rijken
+13  A: 

Check out svnadmin dump/load. It creates a text file with every version of your files. It may be possible to delete everything above/below a certain point and re-import it.

See for instance Migrating Repository Data Elsewhere

Justin Love
I'm looking into this right now thanks. Of course, I was bound to accidentally type svnadmin dump without piping it so now my entire project is being written to stdin (and wont stop with ctrl+c)... I won't make that mistake again :p
nlaq
OK; I am on the right track now, thanks! But how can I make it so it preserves my revisions? I wrote a perl script that, for 1 though 24 "svnadmin dump -r $i:$i+1 <repos> > file", then "svnadmin load <repos> < file" and it only commits revision 1.
nlaq
Make sure you change the guid of your repository while reloading your backup when you change history. Otherwise you might use old workingcopies with a changed database and get misteriously broken revisions later (As they were build on deltas based on no longer existing versions).
Bert Huijben
+1  A: 
Kent Fredric
+2  A: 

If you really want to completely remove files from the repository, you need to do an svndump into a file, filter out the revs and/or file paths you don't want, make a new repo, and svnload the filtered dump into the new repository. You'll want to carefully read the SVN book section on repository maintenance before you do any of this, and make sure you don't remove the existing repo until you're sure the new one has the stuff you want.

genehack
A: 

I'm not entirely sure if this work as I haven't used it in a live production yet, but I just now tried on a test repository (I copied one of my production ones) and it seems to work.

When you're in your repository, use the following command:

svn update -r 24 trunk

Where 24 is the revision number, and trunk is the file/folder you'd like to update (or restore, in this case) to said revision number.

In my test, several files were updated and (re-)added, and after doing a commit I did not receive any warnings whatsoever. I then modified a file with some dummy text and tried yet another commit, and only said file popped up on the modified list. So it seems to work rather well!

Again, I didn't use this before in live productions, so if I'm wrong please advice. I'd love to know if this is the way to go, too, because I can see myself needing this in the (near) future.

-Dave

Dave
This only updates your working copy to this older version, and provides no way to commit this as noted above.
Sander Rijken
Are you sure? I have tried this in a test environment, and it seemed to commit fine? I could be wrong though.
Dave
If the file had revisions after r24 and you modify it, then svn will fail to commit any changes to it and will demand that you update to HEAD first
Wim Coenen
+1  A: 

If the folder structure of you application hasn't changed, checkout the old revision and replace the .svn folders from the latest revision into the checked out old revision. Now you can commit the "older" version.

neesh
simple and effective
Tim
Sounds like a hack to me to be honest.
Sander Rijken
Unfortunately, the folder structure changed significantly otherwise I would just manually delete what needed to be deleted. Thanks for the input though.
nlaq
I agree it's a hack; but this is a one off situation so I am not sure if I would look for the most elegant solution. Something quick and easy would suffice.
neesh
+8  A: 

If you really need to wipe 'evidence' that the files ever existed, you need to do the svndump/svnload actions described above.

In a 'normal' situation, where you made a mistake, you need to use reverse merge. This make sure that undoing the changes after r24 can also be reverted, diffed, etc.

The command below should work to undo your changes (you need to commit the result of the merge to reflect the merge in the repository)

svn merge -r 28:24
Sander Rijken
Haha, well I could go in to detail on how this is not a "normal" situation but would rather not embarrass myself further
nlaq
The 'abnormal' situation would be if you committed something secret, like a file containing a password or something like that; you'd want that removed completely. Last news on this is something was getting started on "svn obliterate"
Sander Rijken
+2  A: 

If you have access to the SVN server, you can just edit path/db/current, put the old revision number you want to revert to (here: 24) there, and remove no longer needed revision files (i.e. 25, 26, 27, 28) from path/db/revs/0/. At least this worked for me today, after I had accidentally removed a directory in the repository.

fuenfundachtzig
By far the fastest way
Hubert Perron
A: 

If you do not avail admin rights then you cannot obliterate any old revisions BUT you can still hide them extremely well with just one amazingly simple "svn copy" command (nickf and JesperE already mentioned this but in a rather cryptic way)

svn copy protocol://svnserver/some/resource@24 protocol://svnserver/some/resource

And that's it, revisions 25 to 28 have completely disappeared from svn log. It's not a hack at all, it is a safe and (barely...) documented feature.

If "resource" is a directory then you must strip it from the last URL:

svn copy protocol://svnserver/some/directory@24 protocol://svnserver/some/

(otherwise you would copy it inside itself)

MarcH
A: 
Example:
    Rev 100 all is working great        
    Rev 101 somebody really corrupted the dir structure and / or merged in bad changes, etc.
    Rev 102 You delete /trunk
    Rev 103 You copy /trunk@100 to HEAD
        You now have a /trunk that reflects only Rev 100 and 103. Not 101 or 102.

svn del svn://[RepoName]/trunk -m "removing issue in HEAD"
svn copy svn://[RepoName]/trunk@100 svn://[RepoName]/trunk -m "Copy of correct revision of trunk to HEAD"
Mazrick