1 Return-Path: <felipe.contreras@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 662D6431FBF
\r
6 for <notmuch@notmuchmail.org>; Thu, 8 May 2014 19:53:58 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id t6zBJrSqm+Ft for <notmuch@notmuchmail.org>;
\r
17 Thu, 8 May 2014 19:53:54 -0700 (PDT)
\r
18 Received: from mail-yk0-f181.google.com (mail-yk0-f181.google.com
\r
19 [209.85.160.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id F0031431FAE
\r
22 for <notmuch@notmuchmail.org>; Thu, 8 May 2014 19:53:53 -0700 (PDT)
\r
23 Received: by mail-yk0-f181.google.com with SMTP id 131so2951531ykp.40
\r
24 for <notmuch@notmuchmail.org>; Thu, 08 May 2014 19:53:52 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=date:from:to:cc:message-id:in-reply-to:references:subject
\r
27 :mime-version:content-type:content-transfer-encoding;
\r
28 bh=/XxYNXa49ANaw2ubcVxaOS7h7eAlTPJKIOh/9N715po=;
\r
29 b=ediSWlSknEvT2IViv8XiheqwPSvADdQkomKrImJE45UYrQWrDrmakZKqjBJFRIp6yz
\r
30 MCA6mxAa18D7AnAipahjq7/vCMS3/TM0WemnR9/lmjx/pYxZsjpo3VQnK7T3NMs7Mifm
\r
31 ZTd3lOmd9xWvm9pEW59gKHeU1kt45e5CaGU5BiDbde52I/b4294dMe7a+HwjgruGLfsd
\r
32 QhhD5L9FDW6jJ8KC6XaWOYy41tq33wmjpA0IzDdbHBE5CzMVsIecD9KG/MJxWy6/IuKy
\r
33 dTbWP9GJRfvf2omr5ttZHk8iw0x/hQF/Go9bmwt95C9m2FUQgFzDx1i25RpoCL8QOEXQ
\r
35 X-Received: by 10.236.166.169 with SMTP id g29mr10361517yhl.135.1399604032279;
\r
36 Thu, 08 May 2014 19:53:52 -0700 (PDT)
\r
37 Received: from localhost (189-211-224-40.static.axtel.net. [189.211.224.40])
\r
38 by mx.google.com with ESMTPSA id d43sm4275980yhb.10.2014.05.08.19.53.48
\r
39 for <multiple recipients>
\r
40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
41 Thu, 08 May 2014 19:53:51 -0700 (PDT)
\r
42 Date: Thu, 08 May 2014 21:43:01 -0500
\r
43 From: Felipe Contreras <felipe.contreras@gmail.com>
\r
44 To: "W. Trevor King" <wking@tremily.us>,
\r
45 Wael Nasreddine <wael.nasreddine@gmail.com>
\r
46 Message-ID: <536c40b5e5333_741a161d310e2@nysa.notmuch>
\r
47 In-Reply-To: <20140508234945.GW28634@odin.tremily.us>
\r
49 <CA+kKtKAw=nEn2dfcvF6++gD5ng+S3T8SLAdVL=Hs=EsvwUg6aw@mail.gmail.com>
\r
50 <87iopgkaiz.fsf@nikula.org> <E1WiJsj-0004mz-VK@teckel.deptj.eu>
\r
51 <20140508101325.GC23124@vilya.m0g.net>
\r
52 <CA+kKtKA8Q5z6Pys9RAumLTiJvmGwWYKGXDkKr9Mh_6ecV-7sdA@mail.gmail.com>
\r
53 <874n0zvqrx.fsf@maritornes.cs.unb.ca>
\r
54 <CA+kKtKBSP0RYRy6GgEWcqTsAm_CzkN7zJfkjfwAgq8HqoyU+WQ@mail.gmail.com>
\r
55 <20140508234945.GW28634@odin.tremily.us>
\r
56 Subject: Re: Github?
\r
58 Content-Type: text/plain;
\r
60 Content-Transfer-Encoding: quoted-printable
\r
61 Cc: notmuch@notmuchmail.org
\r
62 X-BeenThere: notmuch@notmuchmail.org
\r
63 X-Mailman-Version: 2.1.13
\r
65 List-Id: "Use and development of the notmuch mail system."
\r
66 <notmuch.notmuchmail.org>
\r
67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
70 List-Post: <mailto:notmuch@notmuchmail.org>
\r
71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
73 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
74 X-List-Received-Date: Fri, 09 May 2014 02:53:58 -0000
\r
76 W. Trevor King wrote:
\r
77 > On Thu, May 08, 2014 at 11:18:23PM +0000, Wael Nasreddine wrote:
\r
78 > > Well like I said in my first email, if you guys are interested in own=
\r
80 > > and maintaining the GitHub repo it is yours, besides I have not done
\r
81 > > anything with the history I only added one commit which will never co=
\r
83 > > with upstream unless you add a .Travis.yml file :)
\r
86 > I don't think merge conflicts are the problem here. If the GitHub
\r
87 > mirror claims to be a mirror but adds an additional commit B:
\r
90 > -o---o---o---A notmuch/master
\r
95 > Someone who takes the =E2=80=9Cmirror=E2=80=9D claim at face value may =
\r
97 > github/master as the base for some feature:
\r
100 > -o---o---o---A notmuch/master
\r
104 > C---o---o some-feature
\r
106 That wouldn't be a problem if HEAD didn't point to 'master' but to
\r
107 'upstream' which would be 'notmuch/master'.
\r
109 Or if the branch with the modifications was called something else, like
\r