Comment 5 for bug 932464

Revision history for this message
Yaroslav Sokolov (yarick123) wrote :

Alexander Belchenko (bialix) wrote:
> Possible workaround would be
>
> bzr --no-plugins merge /path/to/other/branch

bzr merge --no-plugins ../feature_externals

succeeds, but

bzr commit -m "merged with ../feature_externals"

fails:

bzr: ERROR: Not a branch: "D:/bzr_tests/trunk/ext-modules/ext-1/".

Here is the commands list, the corresponding part of .bzr.log is attached:
D:\bzr_tests\trunk>bzr revert
-D .bzrignore
-D .bzrmeta/
-D .bzrmeta/externals
-D .bzrmeta/externals-snapshot

D:\bzr_tests\trunk>bzr merge --no-plugins ../feature_externals
+N .bzrignore
+N .bzrmeta/
+N .bzrmeta/externals
+N .bzrmeta/externals-snapshot
All changes applied successfully.

D:\bzr_tests\trunk>bzr commit -m "externals-add"
bzr: ERROR: Not a branch: "D:/bzr_tests/trunk/ext-modules/ext-1/".

D:\bzr_tests\trunk>