[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: Les Mikesell <lesmikesell_at_gmail.com>
Date: Wed, 18 Aug 2010 11:54:46 -0500

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
Received on 2010-08-18 18:55:44 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.