Hello,
I try to do my first branch->trunk merge after upgrading to 1.0.8. So, I do
following steps:
1. I select a folder in a working copy of the trunk.
2. In merge window I choose the same folder in the branch, both in 'from'
and 'to' fields. I also set to merge from revision x (when the branch was
created) to head revision.
3. I click OK button and... always get an error message 'Cannot replace a
directory from within'.
I'm getting the same error for every folder in my repository. But if I try
to merge single file, merge works perfectly.
Some issues that may be significant:
- There are spaces in branch patch
- Subversion is in 1.1.0_rc1 version and server is run on Linux (RedHat 9).
What can be the issue? Please help!
P.S. Description for merge option in help is out of date. There is a
screenshot of new merge window, but the descritpion is still for window as
it was in Tortoise 1.0.6.
Michael
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 6 13:35:14 2004