Re: Github?
authorW. Trevor King <wking@tremily.us>
Thu, 8 May 2014 23:49:45 +0000 (16:49 +1700)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 18:02:25 +0000 (10:02 -0800)
08/f5881353e4f5df2d6e7a0798ddb2539f522e0f [new file with mode: 0644]

diff --git a/08/f5881353e4f5df2d6e7a0798ddb2539f522e0f b/08/f5881353e4f5df2d6e7a0798ddb2539f522e0f
new file mode 100644 (file)
index 0000000..48e9428
--- /dev/null
@@ -0,0 +1,163 @@
+Return-Path: <wking@tremily.us>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id E281D431FBF\r
+       for <notmuch@notmuchmail.org>; Thu,  8 May 2014 16:49:52 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.1\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id V-7kdiWph00V for <notmuch@notmuchmail.org>;\r
+       Thu,  8 May 2014 16:49:47 -0700 (PDT)\r
+Received: from qmta03.westchester.pa.mail.comcast.net\r
+       (qmta03.westchester.pa.mail.comcast.net [76.96.62.32])\r
+       by olra.theworths.org (Postfix) with ESMTP id 89029431FAE\r
+       for <notmuch@notmuchmail.org>; Thu,  8 May 2014 16:49:47 -0700 (PDT)\r
+Received: from omta24.westchester.pa.mail.comcast.net ([76.96.62.76])\r
+       by qmta03.westchester.pa.mail.comcast.net with comcast\r
+       id zbll1n0051ei1Bg53bpnDm; Thu, 08 May 2014 23:49:47 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by omta24.westchester.pa.mail.comcast.net with comcast\r
+       id zbpl1n00l152l3L3kbpmXX; Thu, 08 May 2014 23:49:47 +0000\r
+Received: by odin.tremily.us (Postfix, from userid 1000)\r
+       id 43A5F11946BE; Thu,  8 May 2014 16:49:45 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;\r
+       t=1399592985; bh=zNR6umMhhVQNaASUChVI+V5bcUrT5N6C5yVfBor5FoA=;\r
+       h=Date:From:To:Cc:Subject:References:In-Reply-To;\r
+       b=gizuZtMnqRgZPlJGm1Ho+RjGnfn9yNdBpB7h6LMxjRaOWaH2i7YpMw9pVP8KX9Nai\r
+       8OeMM9s706td6iJJkhFjvin5RmfGwSEyNXrw5+E2uocKw4mXufAy+9l5dvMDzHkl2Z\r
+       6YVcMifYRv4NXqRTdC/evuI1BKl9NYqhv/vgRFi8=\r
+Date: Thu, 8 May 2014 16:49:45 -0700\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: Wael Nasreddine <wael.nasreddine@gmail.com>\r
+Subject: Re: Github?\r
+Message-ID: <20140508234945.GW28634@odin.tremily.us>\r
+References:\r
+ <CA+kKtKAw=nEn2dfcvF6++gD5ng+S3T8SLAdVL=Hs=EsvwUg6aw@mail.gmail.com>\r
+       <87iopgkaiz.fsf@nikula.org> <E1WiJsj-0004mz-VK@teckel.deptj.eu>\r
+       <20140508101325.GC23124@vilya.m0g.net>\r
+       <CA+kKtKA8Q5z6Pys9RAumLTiJvmGwWYKGXDkKr9Mh_6ecV-7sdA@mail.gmail.com>\r
+       <874n0zvqrx.fsf@maritornes.cs.unb.ca>\r
+       <CA+kKtKBSP0RYRy6GgEWcqTsAm_CzkN7zJfkjfwAgq8HqoyU+WQ@mail.gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; micalg=pgp-sha1;\r
+       protocol="application/pgp-signature"; boundary="b6rSbt24+kIAbQdu"\r
+Content-Disposition: inline\r
+In-Reply-To:\r
+ <CA+kKtKBSP0RYRy6GgEWcqTsAm_CzkN7zJfkjfwAgq8HqoyU+WQ@mail.gmail.com>\r
+OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;\r
+       url=http://tremily.us/pubkey.txt\r
+User-Agent: Mutt/1.5.23 (2014-03-12)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20140121; t=1399592987;\r
+       bh=pApQztUV123lOLcChOut7FY4XV7u8xS4WDLLWrPPNWY=;\r
+       h=Received:Received:Received:Date:From:To:Subject:Message-ID:\r
+       MIME-Version:Content-Type;\r
+       b=Ue/UJOTvPeY2Kuu9yJ35wdOW00GctvKuaon5hUhyJczg+B/R3ztEOzQuHRMApOmZE\r
+       Aa8dikQfioPRkcgNKmYYVybTBVWhAzP2YnMR03M55o+zUSjEDvNIXK4MuGpOeYH3ok\r
+       HLyYOeZminF34vD2bNbP6JxBeqas7u7n58tqfLDlI+yMbMUcEHoNXN0iVAAmUYuhIl\r
+       SLuaSxX5UVf1SNprgAHZQGW1wheloAxqNq9+t51eDhObmLCWYbOSKRom6roNMaaKb9\r
+       r56Hpp6apxF8PEoprhrUjYba7p7W7PI2PVqvZy9dx26RvxapM4O0AsnqNa1XWSwA2P\r
+       AFYYc1l9hc/aw==\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 08 May 2014 23:49:54 -0000\r
+\r
+\r
+--b6rSbt24+kIAbQdu\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Thu, May 08, 2014 at 11:18:23PM +0000, Wael Nasreddine wrote:\r
+> Well like I said in my first email, if you guys are interested in owning\r
+> and maintaining the GitHub repo it is yours, besides I have not done\r
+> anything with the history I only added one commit which will never confli=\r
+ct\r
+> with upstream unless you add a .Travis.yml file :)\r
+\r
+I don't think merge conflicts are the problem here.  If the GitHub\r
+mirror claims to be a mirror but adds an additional commit B:\r
+\r
+  -o---o---o---A  notmuch/master\r
+                \\r
+                 B  github/master\r
+\r
+Someone who takes the =E2=80=9Cmirror=E2=80=9D claim at face value may use\r
+github/master as the base for some feature:\r
+\r
+  -o---o---o---A  notmuch/master\r
+                \\r
+                 B  github/master\r
+                  \\r
+                   C---o---o  some-feature\r
+\r
+Now when they submit the patches to this list, they might send a patch\r
+series that drags in B (probably not what the some-feature author\r
+wanted).  Alternatively, they might send a patch series starting with\r
+C and say =E2=80=9Cthis is based on B=E2=80=9D, and anyone who's only follo=\r
+wing the\r
+main repo thinks, =E2=80=9CWhat is B?  I don't have that commit.=E2=80=9D.\r
+\r
+You'll also have to continuously rebase github/master to keep A on top\r
+of notmuch/master, which means any feature branches built on\r
+github/master will *also* have to be continuously rebased:\r
+\r
+  -o---o---o---A---D  notmuch/master\r
+                    \\r
+                     A'  github/master\r
+                      \\r
+                       B'---o---o  some-feature\r
+\r
+Keeping a fork with commits that aren't upstream is fine, and\r
+maintaining a fork with an additional .Travis.yml file will probably\r
+be pretty easy, but calling that fork a mirror is going to cause\r
+needless confusion.\r
+\r
+Cheers,\r
+Trevor\r
+\r
+--=20\r
+This email may be signed or encrypted with GnuPG (http://www.gnupg.org).\r
+For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\r
+\r
+--b6rSbt24+kIAbQdu\r
+Content-Type: application/pgp-signature; name="signature.asc"\r
+Content-Description: OpenPGP digital signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v2.0.22 (GNU/Linux)\r
+\r
+iQIcBAEBAgAGBQJTbBgWAAoJEKKfehoaNkbtIA8QAKzc95pEi5Ddcs91KQ/UYkKS\r
+iaqwdAbFRoh2kzJZbpBBzGPhvSyTFHr0eTSXr0o5EVfIdqMc610qtU0GmeRjztzj\r
+o1+gIst9C/JqWXcaxlH3Vqiaf9bbhJ8UtGLjMoGLcc8cudAvF97UG4pual802kND\r
+Q35RDfQ1HJpMuzrQVWI5A4RjL/BB5r66lLO4r8jl1HqmpKIl3kLTJG6kbHVhH2Ap\r
+W19qj0dPO8zBQSKTMbRoDnBlsh1eHrkWP5tINAi5TKFuK+nLeLXw+OAItDCoLpQ7\r
+fX6H4Z8nBs0cehVWVUtjzpruu9jyOyW2/0CFhO3Go0knHfH7kOW6r56CxRwWXewG\r
+k4eMvD58roIGr4Pb3bnBucPClyukondCOt0dV7loUTJLuY2+dpQIj7YnjhTlhqjj\r
+uuBYrx8dPPxpyK0hq1q3ThNJ3Zwg/HtTDo1cYK9XiT16Ah3jfXCX2bppJ/ihL+w+\r
+h9s4HenYhlKRYKmEYvo0tDO5mZ8kUUZcXWi0NP94rDJv3EZjF/1QxJ/ykW1OcxKO\r
+nMqi8JH0dADPPwX/IgjK92H4vJgNhwsVW1v++Uo8HFxR23CdL0e3iy9VmVOtSvIH\r
+awuiII3PfZFFcixpuUCscYhKc5ESrSakA9VVBYzju8S+Ml5VafnVVKrVMi78L/E3\r
+8RA5z6cbJXrSxYxocFt4\r
+=jDKj\r
+-----END PGP SIGNATURE-----\r
+\r
+--b6rSbt24+kIAbQdu--\r