From: David Bremner <david@tethera.net>
To: Keith Packard <keithp@keithp.com>, notmuch@notmuchmail.org
Subject: Re: branchs and tags and merges oh my!
In-Reply-To: <yun7h81brkn.fsf@aiko.keithp.com>
References: <87y60hn0mg.fsf@zancas.localnet> <yun7h81brkn.fsf@aiko.keithp.com>
User-Agent: Notmuch/0.6 (http://notmuchmail.org) Emacs/23.3.1
	(x86_64-pc-linux-gnu)
Date: Fri, 01 Jul 2011 20:47:04 -0300
Message-ID: <87tyb5mumf.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

On Fri, 01 Jul 2011 14:48:24 -0700, Keith Packard <keithp@keithp.com> wrote:
> > 2) merge master onto the release branch
>=20
> This makes doing 'bug fix' stuff on top of 0.6 a bit more challenging.

Can you elaborate? Naively it seems like one ends up with the same kind
of spur of history off of the 0.6 tag in both cases.

=2D---.--------------master
    \
     ---- 0.6 ---- bugfix

versus

=2D----.----------.
      \          \=20
       ---- 0.6--------master
             \
              ----- bugfix

> As an alternative, you probably should have simply put non-release
> patches on a separate 'feature branch' (probably residing in the feature
> author's repository) which would then be merged onto master post-0.6

Yes, that is certainly nice from a git history point of view. On the
other hand the point of separating the roles of feature merger from
release mechanic was to allow Carl more time to work on merging features
into master, and I'm not sure how turning master over to the release
manager helps that.

David

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iJwEAQECAAYFAk4OXHgACgkQTiiN/0Um85lbKQQAg2BbIQ4pJ8n14zV4fVUG6dOE
UgxlFFCddhdWEbizz4ROCl6uhS/FQ4ytBp73k++btS3P5DExVke8qJ2RCcaNmB98
nzfk/YACsRiPnm+86CzjL9tF0U1Bgl7L0hXdce4rXqJpXu6SDXEWlFuK5vjCAFBc
Nh2HEiRH04jigJgSAUI=
=vbBP
-----END PGP SIGNATURE-----
--=-=-=--