1 Return-Path: <wael.nasreddine@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 13E65431FBF
\r
6 for <notmuch@notmuchmail.org>; Thu, 8 May 2014 19:56:26 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.798 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, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7]
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id YR7ZteQ6BUCo for <notmuch@notmuchmail.org>;
\r
18 Thu, 8 May 2014 19:56:21 -0700 (PDT)
\r
19 Received: from mail-oa0-f43.google.com (mail-oa0-f43.google.com
\r
20 [209.85.219.43]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id 3A788431FAE
\r
23 for <notmuch@notmuchmail.org>; Thu, 8 May 2014 19:56:21 -0700 (PDT)
\r
24 Received: by mail-oa0-f43.google.com with SMTP id l6so4201525oag.30
\r
25 for <notmuch@notmuchmail.org>; Thu, 08 May 2014 19:56:20 -0700 (PDT)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=mime-version:references:from:date:message-id:subject:to:cc
\r
28 :content-type; bh=Wd1FFSZVwK7OnOhA/1PRm4hJ5zd15zu+QPFPza20DpI=;
\r
29 b=b0YS4B4/0pCwVIDklrKIygMmf5Y2YZGgiIWe4vRDkK694XoOzYaDzffBoACLAxG1jm
\r
30 nrdDau7jN9xzxmJ18gbkxqnLqPhJU3Xk2ifwwakGDquNfgrz5Z8goksJf6xTRAA3yBo+
\r
31 yrypWiARU3K3r+WWq09sHKFxgVvkVK6cotir/qd668kfVzWVa8IQ/vciCmS3nXDBwfjS
\r
32 ock0IBvF/2EKxDztKBv7j3ifOp651b684Zorty0Ci21Vnhgq2vaz+awYwyGrbLX6KZZr
\r
33 tjOQHwn0lkqTYUAuxTsyDEi8vsnbXaPKxaoVTRGqabeU3J6OqNHwGku5UqIE7WECpvK1
\r
35 X-Received: by 10.60.141.9 with SMTP id rk9mr9891483oeb.12.1399604180722; Thu,
\r
36 08 May 2014 19:56:20 -0700 (PDT)
\r
39 <CA+kKtKAw=nEn2dfcvF6++gD5ng+S3T8SLAdVL=Hs=EsvwUg6aw@mail.gmail.com>
\r
40 <87iopgkaiz.fsf@nikula.org> <E1WiJsj-0004mz-VK@teckel.deptj.eu>
\r
41 <20140508101325.GC23124@vilya.m0g.net>
\r
42 <CA+kKtKA8Q5z6Pys9RAumLTiJvmGwWYKGXDkKr9Mh_6ecV-7sdA@mail.gmail.com>
\r
43 <874n0zvqrx.fsf@maritornes.cs.unb.ca>
\r
44 <CA+kKtKBSP0RYRy6GgEWcqTsAm_CzkN7zJfkjfwAgq8HqoyU+WQ@mail.gmail.com>
\r
45 <20140508234945.GW28634@odin.tremily.us>
\r
46 <536c40b5e5333_741a161d310e2@nysa.notmuch>
\r
47 From: Wael Nasreddine <wael.nasreddine@gmail.com>
\r
48 Date: Fri, 09 May 2014 02:56:18 +0000
\r
50 <CA+kKtKBhMLE7h-0Ski9ixbG-aJMwptseJReinx7_jE73ogZqJA@mail.gmail.com>
\r
51 Subject: Re: Github?
\r
52 To: Felipe Contreras <felipe.contreras@gmail.com>,
\r
53 "W. Trevor King" <wking@tremily.us>
\r
54 Content-Type: multipart/alternative; boundary=047d7b3a9cac04a9f404f8eebe0c
\r
55 Cc: notmuch@notmuchmail.org
\r
56 X-BeenThere: notmuch@notmuchmail.org
\r
57 X-Mailman-Version: 2.1.13
\r
59 List-Id: "Use and development of the notmuch mail system."
\r
60 <notmuch.notmuchmail.org>
\r
61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
62 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
64 List-Post: <mailto:notmuch@notmuchmail.org>
\r
65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
67 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
68 X-List-Received-Date: Fri, 09 May 2014 02:56:26 -0000
\r
70 --047d7b3a9cac04a9f404f8eebe0c
\r
71 Content-Type: text/plain; charset=UTF-8
\r
72 Content-Transfer-Encoding: quoted-printable
\r
74 Actually you can't have the .Travis.yml file in a separate branch, Travis
\r
75 require it present in the context that it is testing (commits to all
\r
78 On Thursday, May 8, 2014 7:53:52 PM, Felipe Contreras <
\r
79 felipe.contreras@gmail.com> wrote:
\r
81 > W. Trevor King wrote:
\r
82 > > On Thu, May 08, 2014 at 11:18:23PM +0000, Wael Nasreddine wrote:
\r
83 > > > Well like I said in my first email, if you guys are interested in
\r
85 > > > and maintaining the GitHub repo it is yours, besides I have not done
\r
86 > > > anything with the history I only added one commit which will never
\r
88 > > > with upstream unless you add a .Travis.yml file :)
\r
90 > > I don't think merge conflicts are the problem here. If the GitHub
\r
91 > > mirror claims to be a mirror but adds an additional commit B:
\r
93 > > -o---o---o---A notmuch/master
\r
97 > > Someone who takes the =E2=80=9Cmirror=E2=80=9D claim at face value may =
\r
99 > > github/master as the base for some feature:
\r
101 > > -o---o---o---A notmuch/master
\r
103 > > B github/master
\r
105 > > C---o---o some-feature
\r
107 > That wouldn't be a problem if HEAD didn't point to 'master' but to
\r
108 > 'upstream' which would be 'notmuch/master'.
\r
110 > Or if the branch with the modifications was called something else, like
\r
116 --047d7b3a9cac04a9f404f8eebe0c
\r
117 Content-Type: text/html; charset=UTF-8
\r
118 Content-Transfer-Encoding: quoted-printable
\r
120 Actually you can't have the .Travis.yml file in a separate branch, Trav=
\r
121 is require it present in the context that it is testing (commits to all bra=
\r
122 nches)<br><br><div>On Thursday, May 8, 2014 7:53:52 PM, Felipe Contreras &l=
\r
123 t;<a href=3D"mailto:felipe.contreras@gmail.com">felipe.contreras@gmail.com<=
\r
124 /a>> wrote:</div>
\r
125 <blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
\r
126 x #ccc solid;padding-left:1ex">W. Trevor King wrote:<br>
\r
127 > On Thu, May 08, 2014 at 11:18:23PM +0000, Wael Nasreddine wrote:<br>
\r
128 > > Well like I said in my first email, if you guys are interested in=
\r
130 > > and maintaining the GitHub repo it is yours, besides I have not d=
\r
132 > > anything with the history I only added one commit which will neve=
\r
134 > > with upstream unless you add a .Travis.yml file :)<br>
\r
136 > I don't think merge conflicts are the problem here. =C2=A0If the G=
\r
138 > mirror claims to be a mirror but adds an additional commit B:<br>
\r
140 > =C2=A0 -o---o---o---A =C2=A0notmuch/master<br>
\r
141 > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \<br>
\r
142 > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0B =C2=A0=
\r
145 > Someone who takes the =E2=80=9Cmirror=E2=80=9D claim at face value may=
\r
147 > github/master as the base for some feature:<br>
\r
149 > =C2=A0 -o---o---o---A =C2=A0notmuch/master<br>
\r
150 > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \<br>
\r
151 > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0B =C2=A0=
\r
153 > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \<br>
\r
154 > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0C=
\r
155 ---o---o =C2=A0some-feature<br>
\r
157 That wouldn't be a problem if HEAD didn't point to 'master'=
\r
159 'upstream' which would be 'notmuch/master'.<br>
\r
161 Or if the branch with the modifications was called something else, like<br>
\r
162 'travis-ci'.<br>
\r
165 Felipe Contreras</blockquote>
\r
167 --047d7b3a9cac04a9f404f8eebe0c--
\r