merge problem: a branch with externals cannot be correctly merged

Bug #932464 reported by Yaroslav Sokolov
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar Externals plugin
Confirmed
Undecided
Eugene Tarasenko

Bug Description

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>

I have this problem with bzr 2.4.2 (Windows), externals 1.3.3 and 1.3.2

Best regards
Yaroslav Sokolov

Revision history for this message
Yaroslav Sokolov (yarick123) wrote :
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

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

I attach attach the commands log and .bzr.log

Revision history for this message
Yaroslav Sokolov (yarick123) wrote :
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>

Revision history for this message
Yaroslav Sokolov (yarick123) wrote :
Changed in bzr-externals:
assignee: nobody → Eugene Tarasenko (eugene-tarasenko)
status: New → Confirmed
Revision history for this message
Yaroslav Sokolov (yarick123) wrote :
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.