Re: Branches

[Jim Hyslop]

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

CARTER-HITCHIN, David, GBM wrote:
> Not sure I understand your reasoning here.  If we:
> 
> - branch off HEAD for major releases
> - take a tags off the branch for releases
> 
> then if a bugfix comes along we generally put it into the current branch
> (and into HEAD, if appropriate, which it generally is) and then promote the
> bugfix revision which is on the branch to the current production tag and
> release that.  This does not compromise new releases - the bugfix goes to
> where it belongs.
[...]
> Perhaps I misunderstand your scheme.

I think we're both taking the same approach. I misunderstood the earlier
message - I thought the author was suggesting that bug fixes be rolled
into current work-in-progress.

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEooRnLdDyDwyJw+MRAiLYAJ9LxQq5ttlWGS7mwqFnp4/MvfYp9wCgt2th
2LLU5ZRmfDWRw24Rn4MLoVE=
=XgIW
-----END PGP SIGNATURE-----