[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 14:35:22 +0100

> > 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-<rev>
  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
Received on 2010-08-18 15:36:04 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.