attn: abentley Re: [BUG] Merging repositories with a directory deleted

[Harald Meland]

[John Eckerdal]

> There is an additional similar case:
>
> An entire directory was removed from a branch. In the remote
> repository a file was then added in the directory. If a merge is
> performed what shall happen?

My suggestion: Create $directory.OTHER in THIS, and put the added file
inside it.  I don't think you can "bzr add $directory.OTHER/$file"
without having $directory.OTHER added, as well; hence, I'd rather just
keep $directory.OTHER as an unknown.

(Aaron said that "Files in an unknown directory will not, themselves,
be marked as unknown", which appear to be true in the sense that "bzr
unknowns" won't list any files inside an unknown directory -- but once
the directory has been added using "bzr add --no-recurse $directory",
the files it contains will appear in the "bzr unknowns" output.)
-- 
Harald