--- /dev/null
+Return-Path: <wael.nasreddine@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 13E65431FBF\r
+ for <notmuch@notmuchmail.org>; Thu, 8 May 2014 19:56:26 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.798\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.798 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, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7]\r
+ 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 YR7ZteQ6BUCo for <notmuch@notmuchmail.org>;\r
+ Thu, 8 May 2014 19:56:21 -0700 (PDT)\r
+Received: from mail-oa0-f43.google.com (mail-oa0-f43.google.com\r
+ [209.85.219.43]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 3A788431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 8 May 2014 19:56:21 -0700 (PDT)\r
+Received: by mail-oa0-f43.google.com with SMTP id l6so4201525oag.30\r
+ for <notmuch@notmuchmail.org>; Thu, 08 May 2014 19:56:20 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=mime-version:references:from:date:message-id:subject:to:cc\r
+ :content-type; bh=Wd1FFSZVwK7OnOhA/1PRm4hJ5zd15zu+QPFPza20DpI=;\r
+ b=b0YS4B4/0pCwVIDklrKIygMmf5Y2YZGgiIWe4vRDkK694XoOzYaDzffBoACLAxG1jm\r
+ nrdDau7jN9xzxmJ18gbkxqnLqPhJU3Xk2ifwwakGDquNfgrz5Z8goksJf6xTRAA3yBo+\r
+ yrypWiARU3K3r+WWq09sHKFxgVvkVK6cotir/qd668kfVzWVa8IQ/vciCmS3nXDBwfjS\r
+ ock0IBvF/2EKxDztKBv7j3ifOp651b684Zorty0Ci21Vnhgq2vaz+awYwyGrbLX6KZZr\r
+ tjOQHwn0lkqTYUAuxTsyDEi8vsnbXaPKxaoVTRGqabeU3J6OqNHwGku5UqIE7WECpvK1\r
+ kHlg==\r
+X-Received: by 10.60.141.9 with SMTP id rk9mr9891483oeb.12.1399604180722; Thu,\r
+ 08 May 2014 19:56:20 -0700 (PDT)\r
+MIME-Version: 1.0\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
+ <536c40b5e5333_741a161d310e2@nysa.notmuch>\r
+From: Wael Nasreddine <wael.nasreddine@gmail.com>\r
+Date: Fri, 09 May 2014 02:56:18 +0000\r
+Message-ID:\r
+ <CA+kKtKBhMLE7h-0Ski9ixbG-aJMwptseJReinx7_jE73ogZqJA@mail.gmail.com>\r
+Subject: Re: Github?\r
+To: Felipe Contreras <felipe.contreras@gmail.com>,\r
+ "W. Trevor King" <wking@tremily.us>\r
+Content-Type: multipart/alternative; boundary=047d7b3a9cac04a9f404f8eebe0c\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:56:26 -0000\r
+\r
+--047d7b3a9cac04a9f404f8eebe0c\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+Actually you can't have the .Travis.yml file in a separate branch, Travis\r
+require it present in the context that it is testing (commits to all\r
+branches)\r
+\r
+On Thursday, May 8, 2014 7:53:52 PM, Felipe Contreras <\r
+felipe.contreras@gmail.com> wrote:\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\r
+> 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\r
+> conflict\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 =\r
+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
+> 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
+> Felipe Contreras\r
+\r
+--047d7b3a9cac04a9f404f8eebe0c\r
+Content-Type: text/html; charset=UTF-8\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+Actually you can't have the .Travis.yml file in a separate branch, Trav=\r
+is require it present in the context that it is testing (commits to all bra=\r
+nches)<br><br><div>On Thursday, May 8, 2014 7:53:52 PM, Felipe Contreras &l=\r
+t;<a href=3D"mailto:felipe.contreras@gmail.com">felipe.contreras@gmail.com<=\r
+/a>> wrote:</div>\r
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=\r
+x #ccc solid;padding-left:1ex">W. Trevor King wrote:<br>\r
+> On Thu, May 08, 2014 at 11:18:23PM +0000, Wael Nasreddine wrote:<br>\r
+> > Well like I said in my first email, if you guys are interested in=\r
+ owning<br>\r
+> > and maintaining the GitHub repo it is yours, besides I have not d=\r
+one<br>\r
+> > anything with the history I only added one commit which will neve=\r
+r conflict<br>\r
+> > with upstream unless you add a .Travis.yml file :)<br>\r
+><br>\r
+> I don't think merge conflicts are the problem here. =C2=A0If the G=\r
+itHub<br>\r
+> mirror claims to be a mirror but adds an additional commit B:<br>\r
+><br>\r
+> =C2=A0 -o---o---o---A =C2=A0notmuch/master<br>\r
+> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \<br>\r
+> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0B =C2=A0=\r
+github/master<br>\r
+><br>\r
+> Someone who takes the =E2=80=9Cmirror=E2=80=9D claim at face value may=\r
+ use<br>\r
+> github/master as the base for some feature:<br>\r
+><br>\r
+> =C2=A0 -o---o---o---A =C2=A0notmuch/master<br>\r
+> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \<br>\r
+> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0B =C2=A0=\r
+github/master<br>\r
+> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \<br>\r
+> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0C=\r
+---o---o =C2=A0some-feature<br>\r
+<br>\r
+That wouldn't be a problem if HEAD didn't point to 'master'=\r
+ but to<br>\r
+'upstream' which would be 'notmuch/master'.<br>\r
+<br>\r
+Or if the branch with the modifications was called something else, like<br>\r
+'travis-ci'.<br>\r
+<br>\r
+--<br>\r
+Felipe Contreras</blockquote>\r
+\r
+--047d7b3a9cac04a9f404f8eebe0c--\r
projects / notmuch-archives.git / commitdiff