Launchpad itself

branch pages should have (a link to) their merge diff

Bug #406058 reported by Martin Pool
14
This bug affects 2 people
Affects Status Importance Assigned to Milestone
Launchpad itself
Triaged
Low
Unassigned

Bug Description

When I'm looking at the page for an under-development feature branch, I find I'm quite often interested in seeing what's actually changed in that branch against trunk. Therefore I'd like to see the diffstat and the diff to the trunk.

I don't mind a lot if that's shown inline in the page or through a link. Possibly you can just craft a Loggerhead URL and not need to do any other code changes.

It's true that not all branches are based off the trunk or intended to land in the trunk. I think doing it just there would cover 90% of cases.

Another way to tackle this would be to put into the revision list links to get the diff for just one revision or the diff from that revision to the branch tip. Then for the somewhat common case where the mainline revisions are obvious (eg done by pqm) you can get this diff without Launchpad needing to offer a specific function for it.

Seeing either the diff on this branch or the merge diff would be ok.

At the moment you can't see this until you create the proposal.

Tags: lp-code
Revision history for this message
Tim Penhey (thumper) wrote : Re: [Bug 406058] [NEW] branch pages should have (a link to) their merge diff

This is the entire use case for the "work in progress" status of a merge
proposal.

Perhaps what we need to do is to allow someone to create the proposal in a
work in progress state but only send out the review email when it is set to
"Needs review".

Revision history for this message
Martin Pool (mbp) wrote : Re: [Bug 406058] [NEW] branch pages should have (a link to) their merge diff

2009/7/29 Tim Penhey <email address hidden>:
> This is the entire use case for the "work in progress" status of a merge
> proposal.
>
> Perhaps what we need to do is to allow someone to create the proposal in a
> work in progress state but only send out the review email when it is set to
> "Needs review".

Ah, interesting. So the 'work in progress' represents an intended
future landing, perhaps far in the future.

I think I might want to look at the diff for someone else's branch
even if they haven't got around to declaring that thing... But
perhaps if it became part of the normal workflow and they always
existed that wouldn't be a problem.

--
Martin <http://launchpad.net/~mbp/>

Revision history for this message
Tim Penhey (thumper) wrote : Re: [Bug 406058] [NEW] branch pages should have (a link to) their merge diff

On Wed, 29 Jul 2009 11:03:56 Martin Pool wrote:
> 2009/7/29 Tim Penhey <email address hidden>:
> > This is the entire use case for the "work in progress" status of a merge
> > proposal.
> >
> > Perhaps what we need to do is to allow someone to create the proposal in
> > a work in progress state but only send out the review email when it is
> > set to "Needs review".
>
> Ah, interesting. So the 'work in progress' represents an intended
> future landing, perhaps far in the future.
>
> I think I might want to look at the diff for someone else's branch
> even if they haven't got around to declaring that thing... But
> perhaps if it became part of the normal workflow and they always
> existed that wouldn't be a problem.

I'm hoping that it will become part of the normal workflow.

Tim Penhey (thumper)
Changed in launchpad-code:
importance: Undecided → Medium
status: New → Triaged
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

The plain statement of this is fixed now, there is a diffstat and a link to the diff on the branch page. But the workflow still doesn't include creating a working in progress merge proposal as a routine step.

Revision history for this message
Tim Penhey (thumper) wrote :

Yes, I was thinking of closing this bug and opening another about workflow.

Curtis Hovey (sinzui)
Changed in launchpad:
importance: Medium → Low
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.