On Tue, Mar 23, 2010 at 12:04 PM, Jonathan Lange <[email protected]> wrote: > On Thu, Mar 18, 2010 at 8:54 PM, Tim Penhey <[email protected]> wrote: >> On Fri, 19 Mar 2010 08:34:39 Brian Murray wrote: >>> I was working on a ubiquity-slideshow branch[1] and would like to >>> propose it for merging into >>> ~ubiquity-slideshow/ubiquity-slideshow-ubuntu/html however I get the >>> following message: >>> >>> "This branch is not mergeable into lp:ubiquity-slideshow-ubuntu." >>> >>> I've really no idea why its not mergeable and would hate to have my work >>> go unmerged. >>> >>> [1] https://code.launchpad.net/~brian-murray/ubiquity-slideshow/xubuntu/ >> >> The are shown as not mergeable as they are in different projects. >> >> ubiquity-slideshow-ubuntu vs. ubiquity-slideshow >> > > What benefit do we get by preventing such things? > > jml
This may also be due to one branch having been upgraded and the other not. I've merged your change at this point, Brian, but what you may also need is to run bzr upgrade on the branch. I had ended up needing to do that for the branch on Launchpad for some reason (which I now forget...), so every branch started from that before a few days ago is incompatible. (Though that can be fixed really quickly by running bzr upgrade). Yours was a bit odd, though; bzr actually crashed for me when I tried to get it, no matter what approach I took. I downloaded the diff Launchpad generated and hoped it would never happen again. Thanks, Dylan PS: Speaking of the ubiquity-slideshow project on Launchpad (launchpad.net/ubiquity-slideshow), unless ubiquity-slideshow-ubuntu can be renamed to that without confusing anything (probably a bad idea), could someone with admin access please remove it? It's completely empty. _______________________________________________ Mailing list: https://launchpad.net/~launchpad-users Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-users More help : https://help.launchpad.net/ListHelp
