want to actually commit a merge from a review

Bug #667859 reported by Martin Pool
This bug report is a duplicate of:  Bug #657550: perform bzr merge in the UI. Edit Remove
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Launchpad itself
New
Undecided
Unassigned

Bug Description

What happens at the moment, for non-robot-managed branches:

- review code in a merge proposal
- post an approve vote
- change to 'approved'
- update my local copy of the destination branch
- copy and paste the branch url to merge from that branch
- (test, resolve conflicts)
- commit changes
- push back to Launchpad

What should optionally happen:

- review the code
- comment
- click 'merge this'

Launchpad should then merge the proposed branch, bail out if there are conflicts, and make a new commit on my behalf (making it clear it was done through lp.)

Obviously this is only useful if there are no mandatory pre-merge tests, and if the branch merges without conflicts, but there are a bunch of small projects like that.

Tags: lp-code
Revision history for this message
Robert Collins (lifeless) wrote : Re: [Bug 667859] [NEW] want to actually commit a merge from a review

Nice... perhaps 'commit this' ?

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

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