Date: Tue, 26 Jan 2010 10:32:31 +1300
From: martin f krafft <madduck@madduck.net>
To: notmuch@notmuchmail.org
Message-ID: <20100125213231.GB15987@lapse.rw.madduck.net>
Mail-Followup-To: notmuch@notmuchmail.org
References: <87my083mgh.fsf@SSpaeth.de> <87d4148s2c.fsf@lillypad.riseup.net>
	<4B595D3A.1030901@SSpaeth.de> <87636u34lw.fsf@SSpaeth.de>
	<87d411zvz8.fsf@yoom.home.cworth.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-ripemd160;
	protocol="application/pgp-signature"; boundary="EuxKj2iCbKjpUGkD"
Content-Disposition: inline
In-Reply-To: <87d411zvz8.fsf@yoom.home.cworth.org>
User-Agent: Mutt/1.5.20 (2009-06-14)
Subject: Re: [notmuch] Git feature branch
Precedence: list


--EuxKj2iCbKjpUGkD
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

also sprach Carl Worth <cworth@cworth.org> [2010.01.23.1010 +1300]:
> Anyway, I'll be on vacation for the next few days, so will likely
> not have much, (likely have not much?), time for patch merging.
>=20
> But I *am* anxious to get back to the backlog. And in the
> meantime, I really appreciate others merging and sharing patches.

I discussed this with Carl at LCA a bit and ideally we should come
up with a way to relieve Carl of the bottleneck burden (obviously
without stealing away his dictator hat ;)

I think it would make sense to move the mainline to git.debian.org
for now, or another place where everyone can easily get an account.
As alternatives I propose repo.or.cz. I'd prefer to stay away from
commercial services like Github.

Once we're there, how about copying the branch structure from
Git development[0]:

  maint/    =E2=80=94 the stable release
  master/   =E2=80=94 the stablising head
  next/     =E2=80=94 testing branch
  pu/       =E2=80=94 patch integration branch (proposed updates)

Each of the four branches is usually a direct descendant of the one
above it. Conceptually, the feature enters at an unstable branch
(usually 'next' or 'pu'), and "graduates" to 'master' for the next
release once it is considered stable enough.

0. http://repo.or.cz/w/git.git/blob/HEAD:/Documentation/gitworkflows.txt

Sebastian, would it make sense to migrate your work into a 'pu'
branch?

What patch tracking workflow should we adopt? Keep sending patches
to the mailing list and have a few people who integrate them into
master or pu (or even maint/next), as appropriate? Use the Debian
bug tracker? Use Sebastian's Roundup instance? Set up a patch queue
manager on notmuchmail.org? Use patchwork [1]?

Cheers,

--=20
martin | http://madduck.net/ | http://two.sentenc.es/
=20
"in all unimportant matters, style, not sincerity, is the essential.
 in all important matters, style, not sincerity, is the essential."
                                                        -- oscar wilde
=20
spamtraps: madduck.bogus@madduck.net

--EuxKj2iCbKjpUGkD
Content-Type: application/pgp-signature; name="digital_signature_gpg.asc"
Content-Description: Digital signature (see http://martin-krafft.net/gpg/)
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEAREDAAYFAkteDe8ACgkQIgvIgzMMSnW1sgCgj6ArxzQy7tbVfvjYE9Gm9qb0
fkgAoKLhcTowF7EQa3OsKUxjU9KNrBJA
=k1Cx
-----END PGP SIGNATURE-----

--EuxKj2iCbKjpUGkD--