star or parallele merge

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

William Dode wrote:
> I've one project used by two clients. To now i use star merging, with 3
> branchs, one main, and one for each clients. When i make a feature for
> one i do it on his branch, when it's finish i merge it to the main
> branch and from the main to the other one.
> 
> I wonder, now that i use bzr (i was using tla and bazaar), if it will
> be possible and better to don't use the main branch, and just keep one
> branch for each and merge between them directly. Specialy that i don't 
> need the main branch for anything else (i'm alone for this private
> project).

Using just two branches sounds fine, in theory.  I don't really
understand why you're using three brances with tla, so I can't be sure
that bzr handles the issue better.

> Is there a sort of documentation about differents organisations of 
> branchs on the wiki ?

I don't think there is, yet.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDO+D00F+nu1YWqI0RArUHAJ9wZe+9NR6yAkUgnBuWT73JXylBRwCfRpJI
eQEluTEra3Bhgxn2u/aZnQ4=
=ba2D
-----END PGP SIGNATURE-----