Re: Github?
authorFelipe Contreras <felipe.contreras@gmail.com>
Fri, 9 May 2014 02:43:01 +0000 (21:43 +1900)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 18:02:27 +0000 (10:02 -0800)
e1/e72db6efe50f2a4b787c6880876816ee4b4231 [new file with mode: 0644]

diff --git a/e1/e72db6efe50f2a4b787c6880876816ee4b4231 b/e1/e72db6efe50f2a4b787c6880876816ee4b4231
new file mode 100644 (file)
index 0000000..10db175
--- /dev/null
@@ -0,0 +1,114 @@
+Return-Path: <felipe.contreras@gmail.com>\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 662D6431FBF\r
+       for <notmuch@notmuchmail.org>; Thu,  8 May 2014 19:53:58 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 t6zBJrSqm+Ft for <notmuch@notmuchmail.org>;\r
+       Thu,  8 May 2014 19:53:54 -0700 (PDT)\r
+Received: from mail-yk0-f181.google.com (mail-yk0-f181.google.com\r
+       [209.85.160.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id F0031431FAE\r
+       for <notmuch@notmuchmail.org>; Thu,  8 May 2014 19:53:53 -0700 (PDT)\r
+Received: by mail-yk0-f181.google.com with SMTP id 131so2951531ykp.40\r
+       for <notmuch@notmuchmail.org>; Thu, 08 May 2014 19:53:52 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=date:from:to:cc:message-id:in-reply-to:references:subject\r
+       :mime-version:content-type:content-transfer-encoding;\r
+       bh=/XxYNXa49ANaw2ubcVxaOS7h7eAlTPJKIOh/9N715po=;\r
+       b=ediSWlSknEvT2IViv8XiheqwPSvADdQkomKrImJE45UYrQWrDrmakZKqjBJFRIp6yz\r
+       MCA6mxAa18D7AnAipahjq7/vCMS3/TM0WemnR9/lmjx/pYxZsjpo3VQnK7T3NMs7Mifm\r
+       ZTd3lOmd9xWvm9pEW59gKHeU1kt45e5CaGU5BiDbde52I/b4294dMe7a+HwjgruGLfsd\r
+       QhhD5L9FDW6jJ8KC6XaWOYy41tq33wmjpA0IzDdbHBE5CzMVsIecD9KG/MJxWy6/IuKy\r
+       dTbWP9GJRfvf2omr5ttZHk8iw0x/hQF/Go9bmwt95C9m2FUQgFzDx1i25RpoCL8QOEXQ\r
+       ztuA==\r
+X-Received: by 10.236.166.169 with SMTP id g29mr10361517yhl.135.1399604032279;\r
+       Thu, 08 May 2014 19:53:52 -0700 (PDT)\r
+Received: from localhost (189-211-224-40.static.axtel.net. [189.211.224.40])\r
+       by mx.google.com with ESMTPSA id d43sm4275980yhb.10.2014.05.08.19.53.48\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Thu, 08 May 2014 19:53:51 -0700 (PDT)\r
+Date: Thu, 08 May 2014 21:43:01 -0500\r
+From: Felipe Contreras <felipe.contreras@gmail.com>\r
+To: "W. Trevor King" <wking@tremily.us>, \r
+       Wael Nasreddine <wael.nasreddine@gmail.com>\r
+Message-ID: <536c40b5e5333_741a161d310e2@nysa.notmuch>\r
+In-Reply-To: <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
+       <20140508234945.GW28634@odin.tremily.us>\r
+Subject: Re: Github?\r
+Mime-Version: 1.0\r
+Content-Type: text/plain;\r
+ charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\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: Fri, 09 May 2014 02:53:58 -0000\r
+\r
+W. Trevor King wrote:\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 own=\r
+ing\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 co=\r
+nflict\r
+> > with upstream unless you add a .Travis.yml file :)\r
+> =\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
+\r
+>   -o---o---o---A  notmuch/master\r
+>                 \\r
+>                  B  github/master\r
+> =\r
+\r
+> Someone who takes the =E2=80=9Cmirror=E2=80=9D claim at face value may =\r
+use\r
+> github/master as the base for some feature:\r
+> =\r
+\r
+>   -o---o---o---A  notmuch/master\r
+>                 \\r
+>                  B  github/master\r
+>                   \\r
+>                    C---o---o  some-feature\r
+\r
+That wouldn't be a problem if HEAD didn't point to 'master' but to\r
+'upstream' which would be 'notmuch/master'.\r
+\r
+Or if the branch with the modifications was called something else, like\r
+'travis-ci'.\r
+\r
+-- =\r
+\r
+Felipe Contreras=\r