Add support for merging from trunk and auto committing

Bug #646537 reported by Ian Booth
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
Wishlist
Unassigned

Bug Description

This is a suggestion for a new feature. Working on a branch, especially one taking a while to complete, you want to fairly regularly merge in any changes from trunk to minimise downstream integration risks. You may have local uncommitted work and you want any trunk changes to be committed "underneath" your own changes.

Currently, the recommended way of doing this is:

shelve -all
merge
commit
unshelve

I think bzr should support this workflow natively. If there are any conflicts when the merge is attempted, then it should allow these to be fixed and then the user should be able easily complete the operation. ie alternate flow:

shelve -all
merge
conflicts -> user fixes
commit
unshelve

I think this could be implemented quite easily by essentially producing a command which in turn calls the 4 required operations. If conflicts
were found during merge, it would write some state somewhere so that when the user fixed the conflicts and re-ran the command, it would notice it got 1/2 way through last time and finish the job.

Ian Booth (wallyworld)
Changed in bzr:
assignee: nobody → Ian Booth (wallyworld)
importance: Undecided → Wishlist
description: updated
Revision history for this message
Vincent Ladeuil (vila) wrote :

@Ian, this sounds like an interesting plugin idea, if you're working on it, please update the status to 'In Progress'.

Changed in bzr:
status: New → Confirmed
Curtis Hovey (sinzui)
Changed in bzr:
assignee: Ian Booth (wallyworld) → Curtis Hovey (sinzui)
assignee: Curtis Hovey (sinzui) → nobody
Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
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.