Weird problems with merging and directories

[Matt Mackall]

On Thu, Oct 04, 2007 at 10:59:40AM -0400, Yaron Minsky wrote:
> 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.

Please send the output of hg merge --debug. Also, please tell us what
version you're using. There are fixes in this area in hg tip and
hg-stable.

-- 
Mathematics is the supreme nostalgia of our time.