Re: reverse merging a delete operation

On fre, aug 12, 2005 at 09:21:11 +0200, Ulrich Eckhardt wrote:
> 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 .

Try:

svn merge -r410:409 $REP .

FWIW, I just replayed your scenario locally with the following sequence.
Cwd is the directory trunk in the working copy:

$ svn mkdir foo
$ touch foo/bar
$ svn add foo/bar
$ svn ci -m "* Added directory foo"
Committed revision 17.

$ svn delete foo
$ svn ci -m "* Deleted directory foo"
Committed revision 18.

$ svn mkdir baz
$ svn ci -m "* Added directory baz"
Committed revision 19.

$ svn merge -r18:17 [repository-url]/trunk baz
A baz/foo
A baz/foo/bar

-- 
Cheers,
- Jacob Atzen
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org