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

reverse merging a delete operation

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: 2005-08-12 09:21:11 CEST

Greetings!

Simple scenario:
In r410, someone deleted folder '/foo-lib' where we stored releases of the
external library 'foo'. Now, some time later, we also store some examples
(the former '/foo-examples') and the sources in '/foo/sources' and
'/foo/examples'. What I now want to do is revive the old '/foo-lib' into
'/foo/releases'. My first approach was to simply reverse-merge the deletion:

  svn mkdir $REP/foo/releases
  svn co $REP/foo/releases releases
  cd releases
  svn merge -r410:409 $REP/foo-lib .

This merge didn't work, as '/foo-lib' doesn't currently exist (File not found:
revision 455, path '/foo-lib'). Okay, peg-revisions to the rescue:

  svn merge -r410:409 $REP/foo-lib@409 .

Still doesn't work (File not found: revision 410, path '/foo-lib'). I'm
slightly puzzled what I should do differently to get this to work, or if I
should rather do something completely different. I guess that copying r409
(i.e. before the delete) over to the new location would also work.

Not sure if it matters, but we're using 1.2 on the clientside and 1.1 on the
server, using svnserve.

thanks for your help!

Uli

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 12 09:23:37 2005

This is an archived mail posted to the Subversion Users mailing list.