From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: branchs and tags and merges oh my!
User-Agent: Notmuch/0.6 (http://notmuchmail.org) Emacs/23.3.1
	(x86_64-pc-linux-gnu)
Date: Fri, 01 Jul 2011 18:37:27 -0300
Message-ID: <87y60hn0mg.fsf@zancas.localnet>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"
Precedence: list

--=-=-=
Content-Transfer-Encoding: quoted-printable


Much to everyone's relief, 0.6 is finally released.

From=20a git perspective, the release process went like this.

0) I branched release from master on June 22
1) I cherry-picked some subset of post June 22 commits from master to
   release=20
1a) actually I cheated and cherry-picked the last few commits
    back from release to master. I don't _think_ this matters.
2) I tagged and uploaded from branch release

=2D----.-------------- master
     \
      ----------release 0.6

So now we have to decide what to do. FWIW, there are about 20 commits on
release past d6f05fd.

There are two obvious strategies going forward.

1) repeat the whole thing with a new release branch for 0.7 and end up
with

=2D---------.--------------.------- master
           \              \=20=20=20
            ----- 0.6      --- 0.7

2) merge master onto the release branch


=2D----------.--------.            ----- master
            \        \          /
             ---------.--------.---- 0.7
            0.6       now      freeze


I personally think having git log 0.6..0.7 do something sensible is
worth a lot, but this option does in some sense make the history of
master messier (some commits occur twice with different sha1's).


Discussion?

d

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iJwEAQECAAYFAk4OPhgACgkQTiiN/0Um85mH0gP/aIo1ExYV/2UX0vLpQkqqTEtx
Xm00TVgVSBVbO6ZGBpjIRJak0HFpWCk4+5nf6zJ4kYzqrS7Ppvb4xJqPmpOlPKGB
FLZnPUHljGxUBfUfDCvh8E40GvK3zZYZHwcnKnn90Sw7HXjI3gXG1Fqqp6FJUXuR
V8lbT4xjK4LkxZTZeGs=
=Dawl
-----END PGP SIGNATURE-----
--=-=-=--