Comment 2 for bug 932464

Revision history for this message
Alexander Belchenko (bialix) wrote : Re: [Bug 932464] [NEW] merge problem: a branch with externals cannot be correctly merged

Yaroslav Sokolov пишет:
> Public bug reported:
>
> steps to reproduce:
> 1 create a branch,
> 2 add an externals-project to the branch, commit
> 3 merge the parent branch with this one
> bzr: ERROR: Not a branch: <external project directory>

Possible workaround would be

bzr --no-plugins merge /path/to/other/branch

--
All the dude wanted was his rug back