[MERGE] Gracefully handle wrong parent kind (Bug #177390)

[John Arbash Meinel]

Aaron Bentley wrote:
> Hi all,
> 
> This patch adds support for gracefully handling one of the few unhandled
> conflict types.  When one side of a merge considers a file-id to be
> a directory, and modifies its contents, while the other side considers
> it to be some other type, Bazaar could detect the problem but not handle
> it gracefully.
> 
> With this patch, a new directory is created with the basename plus the
> extension ".new", and any contents that should be in the directory are
> moved there.  A NonDirectoryParent conflict is added to the working
> tree's conflict list.
> 
> Happy holidays to those of you celebrating!
> 
> Aaron

BB:comment

The only thing preventing this from being approve is backwards
compatibility.

What happens if an old bzr client comes across a tree which has this
conflict set? Does it barf? Does it have a "unknown conflict conflict"?

As this is just the WT, we are a lot less likely to run into it
(Branch/Repo are generally shared by different versions of Bazaar, WT
much less often).

At the least, we need to know what will happen so we can decide if we
want to do it. (At the moment, I think we do, but I wanted to discuss it
first.)

John
=:->