Date: Thu, 8 May 2014 20:01:56 -0700
From: "W. Trevor King" <wking@tremily.us>
To: Felipe Contreras <felipe.contreras@gmail.com>
Subject: Re: Github?
Message-ID: <20140509030156.GY28634@odin.tremily.us>
References:
 <CA+kKtKAw=nEn2dfcvF6++gD5ng+S3T8SLAdVL=Hs=EsvwUg6aw@mail.gmail.com>
	<87iopgkaiz.fsf@nikula.org> <E1WiJsj-0004mz-VK@teckel.deptj.eu>
	<20140508101325.GC23124@vilya.m0g.net>
	<CA+kKtKA8Q5z6Pys9RAumLTiJvmGwWYKGXDkKr9Mh_6ecV-7sdA@mail.gmail.com>
	<874n0zvqrx.fsf@maritornes.cs.unb.ca>
	<CA+kKtKBSP0RYRy6GgEWcqTsAm_CzkN7zJfkjfwAgq8HqoyU+WQ@mail.gmail.com>
	<20140508234945.GW28634@odin.tremily.us>
	<536c40b5e5333_741a161d310e2@nysa.notmuch>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="U6ZV60npyt4sCA+1"
Content-Disposition: inline
In-Reply-To: <536c40b5e5333_741a161d310e2@nysa.notmuch>
OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;
	url=http://tremily.us/pubkey.txt
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: notmuch@notmuchmail.org
Precedence: list


--U6ZV60npyt4sCA+1
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, May 08, 2014 at 09:43:01PM -0500, Felipe Contreras wrote:
> W. Trevor King wrote:
> > I don't think merge conflicts are the problem here.  If the GitHub
> > mirror claims to be a mirror but adds an additional commit B=E2=80=A6
>=20
> That wouldn't be a problem if HEAD didn't point to 'master' but to
> 'upstream' which would be 'notmuch/master'.
>=20
> Or if the branch with the modifications was called something else,
> like 'travis-ci'.

Agreed.  The only problem I'd have is that you'd want to say that the
GitHub repo was a mirror, since the primary repo would still be
git://notmuchmail.org/git/notmuch.  If it's a mirror, I think it
should mirror all refs on the main repo [1] without adding new ones.
I'm happy for 'travis-ci' branches and whatnot in repositories that
don't claim to mirror the notmuchmail.org repo.  I'm also happy to
have the Travis config upstream (in any branch), in which case it
would show up in the mirror.  I just don't think it's a good idea to
have tweaks on a =E2=80=9Cmirror=E2=80=9D that aren't upstream, even if it =
doesn't
effect any upstream refs.

Cheers,
Trevor

[1]: in the style of 'git clone --mirror =E2=80=A6'

--=20
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy

--U6ZV60npyt4sCA+1
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBAgAGBQJTbEUiAAoJEKKfehoaNkbtZrYQALQySZqAb+BP3IJ7TkA4VQSI
0PG27LGljpGAstM9YMebTQq0unTwfBFdwbIdiDnEZpQ6v4Gk2r3y6au2aLwh27FK
w+hDJsB4F392IJmcIZ16OACTj2ZDwpF/fzOje0YFKeqNhm38aq0Zyrc36yeDbrHR
Hts2/mEhX6tWoIdtI/rVVKCzeQ9nwlUAzkIjoWg0wLDFWIyv4dyCzr+S2/fmqjAM
xjKBxeFumDhT7AvVcqNSufmq/VdjfBroDRQnzaUTZlI9s8xmUmfCjSZrR2IFArVM
TSTKPjioAkiqlEr5KFvNq+KzROPNUmtWulrM/qhvkb+LsiBKjrL+ukGWZAT4KhO9
RNjsF4noO/QaWfd7YcboILLX1iNtLR4tOYU/Uzzq+2PE7ho7QQmSGJ5M/+JCqKtw
YD9EbNMa4dZaHVZQa6DruOBQYSXbif48hC2uYCdfJgxiiIQxvFo84Ugip3S0Xy6j
AtdRNYyvKt1PsYrS+Iqdbv4PcshKBcCVqeXaY9QRgOXC/QDb5TcaLYR19Gz7vXoZ
1SwS59BCScnwCGBg85+6sFA7K6E4e2+BA8xWf+PT3A5zAG5NE6tLf2/fMHq/MbpE
c9HJq/7kQscw5t+3O2amhYaIGSWu6fPyQE/fpxyYMVpcxk2fpbr99oFFxpUecChE
PgAn05uFrczNSW4VS0YH
=m39h
-----END PGP SIGNATURE-----

--U6ZV60npyt4sCA+1--