Weird problems with merging and directories

[Yaron Minsky]

We've just started using Mercurial here for some intense renaming, and
we've run into serious problems.  Basically, changes that were made in
one trunk to files that were moved (not deleted) in another trunk showed
the following on the merge:

remote changed janebase/lib/OMakefile which local deleted
(k)eep or (d)elete? k
remote changed janebase/lib/jane_nativeint.mli which local deleted
(k)eep or (d)elete? k
remote changed master-table/util/create_live.ml which local deleted
(k)eep or (d)elete?

and so on.  When I do simple test cases, nothing like this happens.  But
on our real tree, we've gotten a ton of conflicts like this.

y

-- 
Yaron Minsky <yminsky at janestcapital.com>