How to merge a branch in bzr?

Question

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.

Answer 1

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:

1. 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

2. 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.