merge problem: a branch with externals cannot be correctly merged
Bug #932464 reported by
Yaroslav Sokolov
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
Changed in bzr-externals: | |
assignee: | nobody → Eugene Tarasenko (eugene-tarasenko) |
status: | New → Confirmed |
To post a comment you must log in.
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