Bazaar NG workflow question - a possible solution

Aaron Bentley aaron.bentley at utoronto.ca
Wed Oct 25 14:46:34 BST 2006


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

Nicholas Allen wrote:
> Once the developer wants to merge his changes to trunk there would be a
> separate web interface that let the user do this.

Another alternative, depending on your environment, would be for each
developer to have commit rights to the mainline.  They would each have a
private branch and a checkout of the mainline.  When their changes were
ready to be merged, they would

1. cd mainline
2. bzr update
3. bzr merge ../mybranch
4. # resolve conflicts, run tests, whateva.
5. bzr commit

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

iD8DBQFFP2q50F+nu1YWqI0RAm0nAJ9jKBZWeZ/HB++vRbrQyoZrj4Kg3wCfcV2S
0y0fDmlKO3f8WigEbgo1vPI=
=YejT
-----END PGP SIGNATURE-----




More information about the bazaar mailing list