What is a good workflow for developing on kicad

Kicad uses the 'decentralized with human gatekeeper' workflow, with a team of gatekeepers or committers.

The relevant bzr documentation is: http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/distributed_intro.html

Set up a kicad project directory which will contain a shared repository. This way pulling someones branch of kicad only takes the time required to download the differences instead of pulling the whole branch.

>bzr init-repo kicad
>cd kicad
>bzr branch lp:kicad trunk
>bzr branch lp:~hauptmech/kicad/gui-tweaks

Merges work as you would guess... To merge changes from the main line of development into your branch use:

>cd gui-tweaks
>bzr merge ../trunk
>cd ..

bzr can generate a patch file with all the contextual
metadata it needs for a merge.

>cd gui-tweaks
>bzr send -o ../my-new.patch ../trunk
>cd ..

This can be applied by the committers either with 'patch' which ignores the scary looking
blob at the end...

>cd trunk
>patch -p0 ../my-new.patch

or via a merge

>cd trunk
>bzr merge ../my-new.patch