Add support for merging from trunk and auto committing
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.
Changed in bzr: | |
assignee: | nobody → Ian Booth (wallyworld) |
importance: | Undecided → Wishlist |
description: | updated |
Changed in bzr: | |
assignee: | Ian Booth (wallyworld) → Curtis Hovey (sinzui) |
assignee: | Curtis Hovey (sinzui) → nobody |
tags: | added: check-for-breezy |
@Ian, this sounds like an interesting plugin idea, if you're working on it, please update the status to 'In Progress'.