From 43013380101fd720c1f8b5503398000aeb5857a1 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Fri, 9 May 2014 00:13:51 +0000 Subject: [PATCH] Re: Github? --- 1a/3b4abe59178a7bbac3637c4ae8c3f33b5a0d80 | 230 ++++++++++++++++++++++ 1 file changed, 230 insertions(+) create mode 100644 1a/3b4abe59178a7bbac3637c4ae8c3f33b5a0d80 diff --git a/1a/3b4abe59178a7bbac3637c4ae8c3f33b5a0d80 b/1a/3b4abe59178a7bbac3637c4ae8c3f33b5a0d80 new file mode 100644 index 000000000..200470f82 --- /dev/null +++ b/1a/3b4abe59178a7bbac3637c4ae8c3f33b5a0d80 @@ -0,0 +1,230 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 2A4EE431FBF + for ; Thu, 8 May 2014 17:13:56 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.798 +X-Spam-Level: +X-Spam-Status: No, score=-0.798 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id GvnsMs3p23h6 for ; + Thu, 8 May 2014 17:13:52 -0700 (PDT) +Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com + [209.85.214.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 87BF5431FAE + for ; Thu, 8 May 2014 17:13:52 -0700 (PDT) +Received: by mail-ob0-f181.google.com with SMTP id wm4so4008814obc.12 + for ; Thu, 08 May 2014 17:13:52 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=mime-version:references:from:date:message-id:subject:to:cc + :content-type; bh=s3Z1PyDbsB1AfuAnPHGfpr/n2Gs6B5L6D6/59Rm3nYQ=; + b=leXnRcetfcHiy0R3Kureq6Jeer4zQtHknrZRkdwgbgLtQkgy68W7/Js2kkd4U3mpme + dX3hqLIXIqTuZvFaycvFsj73f9uyhW6ZezpNIJIYui2UtdRQ1RmY6m3usX4e5sIrEghp + JXD9EnsL03j0qvsaGjVLeNec8nxRPMcGxAtNOMtMrJVhv0drJl+F4hif6v5ftRumEceP + mtbzQpTUdIEwNWiZ4x2HMlAkqAbUTHarOrtUgWqY8hox8A5mq9eE8fcgPHSFSpcJ1xDg + 2IhTP0AEgdg4y+nWrggjR9zESJAEin5xqTocIsh4dK16FUxa2zjejCWFPH5s9jiMkDrc + Ty2A== +X-Received: by 10.60.145.171 with SMTP id sv11mr8541327oeb.64.1399594431919; + Thu, 08 May 2014 17:13:51 -0700 (PDT) +MIME-Version: 1.0 +References: + + <87iopgkaiz.fsf@nikula.org> + <20140508101325.GC23124@vilya.m0g.net> + + <874n0zvqrx.fsf@maritornes.cs.unb.ca> + + <20140508234945.GW28634@odin.tremily.us> +From: Wael Nasreddine +Date: Fri, 09 May 2014 00:13:51 +0000 +Message-ID: + +Subject: Re: Github? +To: "W. Trevor King" +Content-Type: multipart/alternative; boundary=047d7b5d4748f1be9e04f8ec78ea +Cc: notmuch@notmuchmail.org +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 09 May 2014 00:13:56 -0000 + +--047d7b5d4748f1be9e04f8ec78ea +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: quoted-printable + +I understand. Maybe we should convert the current Github to a real mirror, +mirroring all the branches and tags as is and a) add .Travis.yml upstream +or b) maintain a separate fork (maybe under my own profile) for Travis +integration + +Would you be willing to add Travis.yml upstream? + +In any case, all what I'm trying to do is help, help you with more CI +visibility, your users with a more familiar interface and hopefully attract +more hackers. I really do appreciate all the work done, this is am amazing +project! + + +On Thursday, May 8, 2014 4:49:47 PM, W. Trevor King +wrote: + +> On Thu, May 08, 2014 at 11:18:23PM +0000, Wael Nasreddine wrote: +> > Well like I said in my first email, if you guys are interested in ownin= +g +> > and maintaining the GitHub repo it is yours, besides I have not done +> > anything with the history I only added one commit which will never +> conflict +> > with upstream unless you add a .Travis.yml file :) +> +> 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: +> +> -o---o---o---A notmuch/master +> \ +> B github/master +> +> Someone who takes the =E2=80=9Cmirror=E2=80=9D claim at face value may us= +e +> github/master as the base for some feature: +> +> -o---o---o---A notmuch/master +> \ +> B github/master +> \ +> C---o---o some-feature +> +> Now when they submit the patches to this list, they might send a patch +> series that drags in B (probably not what the some-feature author +> wanted). Alternatively, they might send a patch series starting with +> C and say =E2=80=9Cthis is based on B=E2=80=9D, and anyone who's only fol= +lowing the +> main repo thinks, =E2=80=9CWhat is B? I don't have that commit.=E2=80=9D= +. +> +> You'll also have to continuously rebase github/master to keep A on top +> of notmuch/master, which means any feature branches built on +> github/master will *also* have to be continuously rebased: +> +> -o---o---o---A---D notmuch/master +> \ +> A' github/master +> \ +> B'---o---o some-feature +> +> Keeping a fork with commits that aren't upstream is fine, and +> maintaining a fork with an additional .Travis.yml file will probably +> be pretty easy, but calling that fork a mirror is going to cause +> needless confusion. +> +> Cheers, +> Trevor +> +> -- +> This email may be signed or encrypted with GnuPG (http://www.gnupg.org). +> For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privac= +y +> + +--047d7b5d4748f1be9e04f8ec78ea +Content-Type: text/html; charset=UTF-8 +Content-Transfer-Encoding: quoted-printable + +I understand. Maybe we should convert the current Github to a real mirror, = +mirroring all the branches and tags as is and a) add .Travis.yml upstream o= +r b) maintain a separate fork (maybe under my own profile) for Travis integ= +ration
+
Would you be willing to add Travis.yml upstream?

In any case, al= +l what I'm trying to do is help, help you with more CI visibility, your= + users with a more familiar interface and hopefully attract more hackers. I= + really do appreciate all the work done, this is am amazing project!
+

On Thursday, May 8, 2014 4:49:47 PM, W. Trevor King <wking@tremily.us> wrote:
+On Thu, May 08, 2014 at 11:18:23PM +0000, Wael Nasreddine wrote:
+> Well like I said in my first email, if you guys are interested in owni= +ng
+> and maintaining the GitHub repo it is yours, besides I have not done +> anything with the history I only added one commit which will never con= +flict
+> with upstream unless you add a .Travis.yml file :)
+
+I don't think merge conflicts are the problem here. =C2=A0If the GitHub= +
+mirror claims to be a mirror but adds an additional commit B:
+
+=C2=A0 -o---o---o---A =C2=A0notmuch/master
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0B =C2=A0githu= +b/master
+
+Someone who takes the =E2=80=9Cmirror=E2=80=9D claim at face value may use<= +br> +github/master as the base for some feature:
+
+=C2=A0 -o---o---o---A =C2=A0notmuch/master
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0B =C2=A0githu= +b/master
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0C---o-= +--o =C2=A0some-feature
+
+Now when they submit the patches to this list, they might send a patch
+series that drags in B (probably not what the some-feature author
+wanted). =C2=A0Alternatively, they might send a patch series starting with<= +br> +C and say =E2=80=9Cthis is based on B=E2=80=9D, and anyone who's only f= +ollowing the
+main repo thinks, =E2=80=9CWhat is B? =C2=A0I don't have that commit.= +=E2=80=9D.
+
+You'll also have to continuously rebase github/master to keep A on top<= +br> +of notmuch/master, which means any feature branches built on
+github/master will *also* have to be continuously rebased:
+
+=C2=A0 -o---o---o---A---D =C2=A0notmuch/master
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= +=A0A' =C2=A0github/master
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= +=A0 \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= +=A0 =C2=A0B'---o---o =C2=A0some-feature
+
+Keeping a fork with commits that aren't upstream is fine, and
+maintaining a fork with an additional .Travis.yml file will probably
+be pretty easy, but calling that fork a mirror is going to cause
+needless confusion.
+
+Cheers,
+Trevor
+
+--
+This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
+For more information, see http://en.wikipedia.org/wiki/Pretty_Go= +od_Privacy
+ + +--047d7b5d4748f1be9e04f8ec78ea-- -- 2.26.2