Cannot seem to get code from a prerequisite repository/reference path to not show up in MP

Asked by Darren Hoyland

I cannot seem to get code from a prerequisite repository/reference path to not show up in MP

I'm trying to merge 2 branches intomaster.

My origin master branch is at lp:~weebl-maintainers/weebl/+git/weebl/+ref/master (private repo)

The branches meanwhile live on another repo at lp:~autonomouse/weebl/+git/weebl/
so I've got lp:~autonomouse/weebl/+git/weebl/+ref/branch/one
and lp:~autonomouse/weebl/+git/weebl/+ref/branch/two

As branch/two is based on top of branch/one, I want to make a merge proposal that shows a diff that ignores any changes already included in branch/one. For bzr, you can do this with prerequisite branches, so I assumed you could do the same with the prerequisite branches on git.

So I make the MP for the branch/one as usual, and then when I come to make the MP for branch/two, I click on the extra options bit and add ~autonomouse/weebl/+git/weebl to the prerequisite repository and branch/one to the prerequisite reference path.

However, when I do this, the changes from branch/one are still included in the MP for branch/two.

Can you tell me where I'm going wrong?

Thanks

Question information

Language:
English Edit question
Status:
Solved
For:
Launchpad itself Edit question
Assignee:
No assignee Edit question
Solved by:
Colin Watson
Solved:
Last query:
Last reply:
Revision history for this message
Colin Watson (cjwatson) said :
#1

You aren't doing anything wrong, I suspect; I'm going to turn this into a bug report.

Revision history for this message
Darren Hoyland (autonomouse) said :
#2

Ah, okay. Thanks Colin.

I'm told that someone else had it working, so I thought it was me doing something wrong. Maybe it's to do with it being a private repo or something?

Revision history for this message
Colin Watson (cjwatson) said :
#3

I don't think so. The diff handling necessary for this is simply unimplemented; your interlocutor must have been mistaken.

Revision history for this message
Best Colin Watson (cjwatson) said :
#4

This should all work for you now. Sorry for the delay! We should be able to deploy changes to the git backend much more quickly in future, now that we're over this hump.

Revision history for this message
Darren Hoyland (autonomouse) said :
#5

Thanks Colin Watson, that solved my question.