RE: Restore all trunk!
> 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-" where 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
Re: Restore all trunk!
2010/8/18 Steven Koch : > 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! > You should learn about using peg revisions, they allow to address paths that existed earlier: http://svnbook.red-bean.com/nightly/en/svn.advanced.pegrevs.html see also Resurrecting Deleted Items, http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo Best regards, Konstantin Kolinko
Re: Restore all trunk!
Thnks 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 wrote: > > 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-" where 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
RE: Restore all trunk!
> Thnks > > > 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 If you have reverse-merge the offending revisions than your working copy is at revision 3251. Can you tell us *exactly* what commands did you use? G Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
Re: Restore all trunk!
Hi, I need update the servers, and continue send changes to the point 3243! but actual content of SVN server are different (now r3251 is considered new files, same that they are equals files) We have two servers(stagging and production), one development machine and one repository SVN server separated. SVN server considerate all files how new. And when try update server stagging teel me: - 'svn: Failed to add directory 'libDirectory': object of the same name already exists' My revision in local copy is 3243 but in SVN server 3251 I think that solution is rollback the same revision of the servers (stagging and production) and later apply the changes in content and update servers(stagging and production)! But I can rollback in my local copy to r3243 but not can commit this revision or point! On Aug 18, 1:42 pm, Giulio Troccoli wrote: > > Thnks > > > 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 > > If you have reverse-merge the offending revisions than your working copy is > at revision 3251. Can you tell us *exactly* what commands did you use? > > G > > Linedata Limited > Registered Office: 85 Gracechurch St., London, EC3V 0AA > Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
Re: Restore all trunk!
But I know'n making it!! :( On Aug 18, 2:07 pm, Steven Koch wrote: > Hi, > > I need update the servers, and continue send changes to the point > 3243! but actual content of SVN server are different (now r3251 is > considered new files, same that they are equals files) > > We have two servers(stagging and production), one development machine > and one repository SVN server separated. > > SVN server considerate all files how new. And when try update server > stagging teel me: > - 'svn: Failed to add directory 'libDirectory': object of the same > name already exists' > > My revision in local copy is 3243 but in SVN server 3251 > > I think that solution is rollback the same revision of the servers > (stagging and production) and later apply the changes in content and > update servers(stagging and production)! > > But I can rollback in my local copy to r3243 but not can commit this > revision or point! > > On Aug 18, 1:42 pm, Giulio Troccoli > wrote: > > > > Thnks > > > > 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 > > > If you have reverse-merge the offending revisions than your working copy is > > at revision 3251. Can you tell us *exactly* what commands did you use? > > > G > > > Linedata Limited > > Registered Office: 85 Gracechurch St., London, EC3V 0AA > > Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 > >
Re: Restore all trunk!
Hi You're not really making sense, but I would recommend that you leave your working copy alone for now. Make a new checkout that will get you latest in trunk. Merge back to the revision you wanted and commit.. Now you should be back where you were before you messed up. Then ask us for help on what you tried to achieve in the beginning, maybe there's a better way to do it ;-) Cheers / Erik On Wed, Aug 18, 2010 at 3:13 PM, Steven Koch wrote: > But I know'n making it!! > > :( > > On Aug 18, 2:07 pm, Steven Koch wrote: > > Hi, > > > > I need update the servers, and continue send changes to the point > > 3243! but actual content of SVN server are different (now r3251 is > > considered new files, same that they are equals files) > > > > We have two servers(stagging and production), one development machine > > and one repository SVN server separated. > > > > SVN server considerate all files how new. And when try update server > > stagging teel me: > > - 'svn: Failed to add directory 'libDirectory': object of the same > > name already exists' > > > > My revision in local copy is 3243 but in SVN server 3251 > > > > I think that solution is rollback the same revision of the servers > > (stagging and production) and later apply the changes in content and > > update servers(stagging and production)! > > > > But I can rollback in my local copy to r3243 but not can commit this > > revision or point! > > > > On Aug 18, 1:42 pm, Giulio Troccoli > > wrote: > > > > > > Thnks > > > > > > 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 > > > > > If you have reverse-merge the offending revisions than your working > copy is at revision 3251. Can you tell us *exactly* what commands did you > use? > > > > > G > > > > > Linedata Limited > > > Registered Office: 85 Gracechurch St., London, EC3V 0AA > > > Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 > > > > >
RE: Restore all trunk!
> > We have two servers(stagging and production), one > development machine > > and one repository SVN server separated. Do you mean to say that the staging and production machines have a working copy of the same SVN repository? > > > If you have reverse-merge the offending revisions than > your working copy is at revision 3251. Can you tell us > *exactly* what commands did you use? > > You haven't told us what command you used! Or maybe you didn't even try to reverse-merge? If so: - update your working copy with "svn update". This will take your working copy to revision 3251 - look at the log and take a note of the revisions you have to take out - issue the merge command as follows for each of those revisions, from the highest to the lowest: svn merge -c- The dash after the c and before the revision is the bit that tells Subversion to reverse-merge the changes rather than re-apply them - check the status of your working copy to see that it is exactly how you want it - commit Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
Re: Restore all trunk!
On 8/18/2010 8:07 AM, Steven Koch wrote: Hi, I need update the servers, and continue send changes to the point 3243! but actual content of SVN server are different (now r3251 is considered new files, same that they are equals files) If you deleted the trunk and then committed new copies of the files to it, they are new files to svn. Even if the content is the same there is no way to see the ancestry. My revision in local copy is 3243 but in SVN server 3251 I think that solution is rollback the same revision of the servers (stagging and production) and later apply the changes in content and update servers(stagging and production)! But I can rollback in my local copy to r3243 but not can commit this revision or point! If you want to put what was in 3243 back to the head of the trunk, you should be able to delete the trunk again, then copy it in the repository using peg notation for the source URL to indicate the revision before the deletion. This should put it back at the HEAD with a history that goes 'around' the deletions. Then you'd have to repeat any changes that you wanted to keep that were made after the peg revision you copied. I'd recommend trying this in a test repository first to see if you get the effect you want. -- Les Mikesell lesmikes...@gmail.com
Re: Restore all trunk!
Resolved! thnks for all!!! Your answer very usefuly!!! I flow: 'svn merge -r 3256:3255 svn://svn.mylocation/repositoryName/trunk' svn commit -m 'merge 3256:3255' Until I reached 3243!!! Thnks! Steven Koch 2010/8/18 Giulio Troccoli > > > We have two servers(stagging and production), one > > development machine > > > and one repository SVN server separated. > > Do you mean to say that the staging and production machines have a working > copy of the same SVN repository? > > > > > If you have reverse-merge the offending revisions than > > your working copy is at revision 3251. Can you tell us > > *exactly* what commands did you use? > > > > > You haven't told us what command you used! Or maybe you didn't even try to > reverse-merge? If so: > - update your working copy with "svn update". This will take your working > copy to revision 3251 > - look at the log and take a note of the revisions you have to take out > - issue the merge command as follows for each of those revisions, from the > highest to the lowest: svn merge -c- > The dash after the c and before the revision is the bit that tells > Subversion to reverse-merge the changes rather than re-apply them > - check the status of your working copy to see that it is exactly how you > want it > - commit > > > Linedata Limited > Registered Office: 85 Gracechurch St., London, EC3V 0AA > Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 > > > > > -- Com os melhores cumprimentos, Steven Koch Sistemas de Informação E-mail: stevenk...@surfih.com http://www.surfih.com http://twitter.com/stvkoch
