Weird merge issue

Hi Everyone,

I am using svn 1.5.1 for the server and 1.5.2 for the command line
client.

I removed a folder and committed the change using the following;

svn rm branches/folder1
svn commit -m '......'

I then realised I had removed the wrong directory.

And attempted to reverse the last commit;
cd /svnroot
svn merge -c -xx branches

The merge didn't work. it reported;
Skipped missing target: 'pathname'

Followed by a skipped message for all sub directories in /svnroot/
branches/pathname

However the deleted directory and sub-directories are still missing.

svn update performs no work
svn status reports no differences.

As always - thanks for any help you might be able to provide.

Beau.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-07 20:05:58 CEST