Yep, at a brief inspection of the code, the MergeIntoMergeType._entries_to_incorporate logic in bzrlib doesn't cope well with the case where the source path is anything other than a directory. It's probably not very hard to fix.
Yep, at a brief inspection of the code, the MergeIntoMergeT ype._entries_ to_incorporate logic in bzrlib doesn't cope well with the case where the source path is anything other than a directory. It's probably not very hard to fix.