Question

0

How to merge a branch in bzr?

rated 0 times [ 0] [ 0] / answers: 1 / hits: 973 / 3 Years ago, tue, november 9, 2021, 1:30:53

I am a participant in the Ubuntu App Showdown contest and I got some feedback https://myapps.developer.ubuntu.com/dev/apps/1183/feedback/ and I want to merge the bzr branch of M. Hall to my main branch.

How I can do this correctly because I don't want to cause any problem...

edit: I found this How do I apply the fixes suggested from the App Review Board to my app?

but I have a problem

chris@chris-Aspire-5732Z ~/Projects/MangaR/mangar $ bzr merge lp:~mhall119/ubuntu-app-reviews/mangar

bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.

Answers

Only authorized users can answer the question. Please sign in first, or register a free account.

finatch

Add To Favorites

Follow

Total Points: 49

Total Questions: 106

Total Answers: 94

Location: Kazakhstan

Member since Mon, Sep 26, 2022

2 Years ago

answered 3 Years ago onbean · Accepted Answer

The error message means the two branches are completely unrelated. It's like trying to merge the Gnome project into the KDE project.

I think you have two options:

Apply the changes of mhall as a patch on your code.
```
bzr branch lp:~yourbranch mangar

bzr branch lp:~mhall119/ubuntu-app-reviews/mangar mhall-mangar

bzr diff -r300..-1 mhall-mangar | (cd mangar; patch -p0)
```
Instead of revision 300 use the revision number right before mhall's commit. If in fact he made only one commit, you can use -c-1 instead of -r

Copy the version of mhall on top of your code.
```
bzr branch lp:~yourbranch mangar

bzr branch lp:~mhall119/ubuntu-app-reviews/mangar mhall-mangar

cp -r mhall-mangar/* mangar/
```
After this check the differences, most of them you probably want to revert, and keep only the changes that were done by mhall.