Missing option to ignore ancestry in Merge dialog

Hello.

I have a case where a directory was deleted and then re-added again on the trunk. When I attempt to do a merge from trunk, it stops when it comes to the re-add of the directory. I can get around that with the commandline client using the --ignore-ancesty option, but there is no such option in the TortoiseSVN Merge dialog :-(

Data:
Branch is copied from trunk revision 773.
Working copy is updated and is at revision 948.

I do the equivalent of "svn merge trunk_at_773 trunk_at_948 wc". It stops, saying "svn: URL 'svn+ssh://svn@svn/repository/x/trunk/xxx' doesn't match existing URL 'svn+ssh://svn@svn/repository/x/branches/project-x/xxx' in 'project-x/xxx'".

The log records the deletion and addition like this:

------------------------------------------------------------------------
r867 | ac | 2006-01-16 13:01:59 +0100 (Mon, 16 Jan 2006) | 1 line
Changed paths:
   A /trunk/xxx

------------------------------------------------------------------------
r866 | ac | 2006-01-16 13:00:25 +0100 (Mon, 16 Jan 2006) | 2 lines
Changed paths:
   D /trunk/xxx

It appears to stop when trying apply r867.

With --ignore-ancestry, the merge behaves as a diff and allows the merge to finish.

So ... Is there some hidden way to make the TortoiseSVN Merge dialog ignore ancestry or do I have to use the commandline?

--
Med venlig hilsen
Odinn Sørensen, QA Chef
TELMORE A/S
Carl Gustavs Gade 3, 2630 Taastrup
www.telmore.dk
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org