Re: merge problem. impossible to revert deleted file

[Gunnar Dalsnes]

On 11.11.2011 16:51, Philip Martin wrote:
You can't revert wc/D/f without reverting the replace of wc/D.
Does this mean it's not possible to merge if the same dir is created 
both in trunk and in branch? Can the "replace" of the "duplicate" dir be 
avoided somehow? If not, it would be nice with an option to disable 
tree-conflict for dirs, just "accepting" existing dirs with same name.

thanks,
Gunnar.