Bazaar recommended practices

[Jonathan Lange]

On Tue, Jul 8, 2008 at 6:56 AM, Alexandros Frantzis <alf82 at freemail.gr> wrote:
> 1. How do you handle small changes to a project: do you create a new
> branch for every small change, have a long standing eg 'trivial' branch
> or change the local branch of trunk directly?
>

For most projects, I do the first thing: make a branch for every small
change. Some projects I work on go a step further and have a bug
report for every small change.

For projects where I'm the only developer, I commit small changes
directly to trunk.

> 2. Where do you commit branches to the mainline from: do you merge the
> current (local copy of) trunk into a feature branch and push from there,
> the other way round or perhaps keep a second branch of trunk used just
> for merging and pushing?
>

Here's what I do by default:

$ cd trunk
$ bzr merge ../my-branch
$ bzr ci -m "Message summarising exactly what the branch does and why
this is a good thing"
$ bzr push

Another option is to have managed merges to trunk using something like
PQM. With this set up, you send an email to a robot saying "please
merge this branch to trunk" and then the robot does the merge, perhaps
running some tests before landing the change.

jml