[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: Steven Koch <stvkoch_at_gmail.com>
Date: Wed, 18 Aug 2010 05:26:27 -0700 (PDT)


But, I can rolback the revision on my working copy (NOW my working
copy are 3243, and the SVN 3251), but not can commit this 'rollback'
to trunk! because this revision already exists on SVN Server

This causing that the servers cannot update your files, because same
files already exists and cause conflict, withoud show message confict!
(SVN Server=new "add" files!, Web Server=Olds)

Message error: "svn: Failed to add directory 'libDirectory': object of
the same name already exists"

I try, commit later rollback to resivion 3243, but nothing happens!

On Aug 18, 1:03 pm, Giulio Troccoli <Giulio.Trocc..._at_uk.linedata.com>
> > 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 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.
> G
> 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:27:07 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.