Cherrypicking workflows with bzr

[Matthew Palmer]

I'm currently using baz to support the following workflow.  Can bzr handle a
similar workflow, or how can I achieve a similar result in bzr?

One master trunk holds all of the "common" files for all of the different
projects -- templates, common config files, and so on.

There are a number of branches taken from this trunk, one for each separate
site we're supporting.  The branch contains customisation of the common
config, deployments of the templates into new files, and often new general
purpose features needed by a particular branch.

Periodically, we go through the branches and "remerge" all of the useful
general features back into the trunk for other branches to use.  Since a lot
of changesets aren't suitable for the trunk, we replay the relevant branch
changesets into the trunk and then sync-tree all of the unwanted changesets,
so that we can use "baz missing" to tell us about what changesets in a
branch haven't been merged/ignored in the trunk.

For various practical reasons, we can't always implement new features in the
trunk and then push them out to the branch, and it would be problematic to
require each new feature on a branch.

I'll happily admit that I'm not "up" on the latest of bzr, and I'm not 100%
confident I've got the whole bzr mental model of data and metadata yet, so
this may be something that is trivial.  But my current understanding is that
bzr's underlying concepts are quite different to baz's, so taking single
changesets out of branches and keeping everything straight isn't done in the
same way.

All help and comments appreciated.

- Matt