Branching workflow question

[Robert Collins]

On Tue, 2009-04-21 at 15:13 -0700, Guy Gascoigne-Piggford wrote:
> 
> switch to a checkout of the feature branch.
> update it. (bzr up)
> merge from the dev branch to the feature branch) (bzr
> merge ../dev_branch) - barring timing issues there really aren't
> likely to be conflicts, but if there are then we either cycle back to
> stage 1, or just resolve them here and continue.
> check in (bzr ci).
> 
> This works and isn't particularly tricky, but it somehow seems that
> we're missing something.  I noticed that in all of the discussions
> about checkouts recently, not one of them mentioned using them as a
> way to manage a merge to a remote branch, and that's pretty much
> exactly what we are doing.

Committing to trunk is one of the major reasons for checkouts, and why
checkouts with history are very useful; I use them all the time ;).

For your process I would do:
cd trunk
bzr merge ../dev_branch
fixup conflicts
regression-test if needed
bzr commit

That seems much more direct.

-Rob
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090422/d2ca3bb7/attachment.pgp