registry team mailing list archive

Thread
Date

[Bug 627119] [NEW] Can not merge branches that have no common ancestor

To: registry@xxxxxxxxxxxxxxxxxxx
From: Launchpad Bug Tracker <627119@xxxxxxxxxxxxxxxxxx>
Date: Tue, 31 Aug 2010 19:02:20 -0000
Reply-to: Bug 627119 <627119@xxxxxxxxxxxxxxxxxx>
Sender: bounces@xxxxxxxxxxxxx

You have been subscribed to a public bug:

If one wishes to use recipes to build source packages, one encounters
situations where it is not possible to merge two branches.

For example

lp:upstream branch
merge packaging lp:packaging 

results in a 'no last common ancestor' error as neither branches have
any shared history.

The current workaround is to use the 'nest' and 'run' command and move
the required files (the debian dir in this case) into the branch, then
remove unnecessary files.

However, the run command is not supported on launchpad.

** Affects: null
     Importance: Undecided
         Status: New

** Affects: udd
     Importance: Undecided
         Status: New

-- 
Can not merge branches that have no common ancestor
https://bugs.edge.launchpad.net/bugs/627119
You received this bug notification because you are a member of Registry Administrators, which is the registrant for NULL Project.