[rfc] merging release branches back into bzr.dev

Aaron Bentley aaron.bentley at utoronto.ca
Wed Oct 3 12:28:12 BST 2007


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

Martin Pool wrote:
> Our current instructions for making releases say that after doing the
> release, the rm should make an untracked merge back into trunk.
> 
> I can see two main reasons for this: one is that it prevents people
> accidentally pulling trunk into a branch that's based on the release;

Another way we can avoid this is by upgrading the branch to
dirstate-tags, and setting append_revisions_only to True.

> the other is that it's arguably incorrect to merge the change that
> gave the release it's version number.

I guess I see what you mean, but I think the benefits are worth it.  If
we feel the need to lie to Bazaar about what's been merged, we should
figure out why, and fix it.

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

iD8DBQFHA3zM0F+nu1YWqI0RAnRTAJ406xqxOXiFw7yY/7Lvcme2TsBRqACfX/bO
vUeOrQxJW+S0yYsmG8i0GTM=
=ZUgc
-----END PGP SIGNATURE-----



More information about the bazaar mailing list