Take the 2-minute tour ×
Ask Ubuntu is a question and answer site for Ubuntu users and developers. It's 100% free, no registration required.

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.
share|improve this question
add comment

2 Answers

up vote 1 down vote accepted

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.

share|improve this answer
add comment

use the -r0..-1 option with bzr merge

Example:

 bzr merge lp:~mhall119/ubuntu-app-reviews/mangar -r0..-1

I found this answer here

I like this solution better than the currently accepted answer, because now you should be able to still merge future changes from upstream, and it should "just work"

Also, it might be beneficial for you to branch from the existing project, then move everything to a subdirectory, then commit, then merge from that new branch with -r0..-1

Example:

 cd ..
 bzr branch lp:~mhall119/ubuntu-app-reviews/mangar mangar_branch
 cd mangar_branch
 mkdir mangar
 bzr add mangar
 bzr mv * mangar
 bzr commit
 cd ../${YOUR_TARGET_BRANCH}
 bzr merge ../mangar_branch -r0..-1
share|improve this answer
add comment

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.