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

RE: Restore all trunk!

From: Giulio Troccoli <Giulio.Troccoli_at_uk.linedata.com>
Date: Wed, 18 Aug 2010 13:03:57 +0100

> Hi
> I'm in a dirt, and would like a help!
> I will describe the workflow of the donkey:
> - Copy the contents of a local branch to another folder and
> removed all references .svn this folder.
> - And later removed the contents of the trunk location, via "svn rm"
> and submitted via commit this change.
> - Copy the content local without the .svn to the trunk local
> and added to SVN (svn add) and after a commit.
> Now SVN does not accept more updates on the svn server
> stagging production and says that since there is already a
> copy of the content!
> (Svn: Failed to add directory '.. \ w +..': object of the
> same name already exists)
> They claimed that the merge was not working because it gave
> conflicts in all changed files!
> How do I restore the remote repository for the review (3243)
> before these changes??
> "svn update -r 3243" + "svn commit", not restory, because it
> revision exists of already!

Have you tried reverse back all those commits? I would create a fresh working copy of trunk and then reverse back all those commites with "svn merge -c-<rev>" where <rev> are the revision to reverse back. I would do them in order, so something like 3243, then 3242, etc. When your working copy is back to what it was before commit.


Linedata Limited
Registered Office: 85 Gracechurch St., London, EC3V 0AA
Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
Received on 2010-08-18 14:04:38 CEST

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.