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 13E65431FBF for ; Thu, 8 May 2014 19:56:26 -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 YR7ZteQ6BUCo for ; Thu, 8 May 2014 19:56:21 -0700 (PDT) Received: from mail-oa0-f43.google.com (mail-oa0-f43.google.com [209.85.219.43]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 3A788431FAE for ; Thu, 8 May 2014 19:56:21 -0700 (PDT) Received: by mail-oa0-f43.google.com with SMTP id l6so4201525oag.30 for ; Thu, 08 May 2014 19:56:20 -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=Wd1FFSZVwK7OnOhA/1PRm4hJ5zd15zu+QPFPza20DpI=; b=b0YS4B4/0pCwVIDklrKIygMmf5Y2YZGgiIWe4vRDkK694XoOzYaDzffBoACLAxG1jm nrdDau7jN9xzxmJ18gbkxqnLqPhJU3Xk2ifwwakGDquNfgrz5Z8goksJf6xTRAA3yBo+ yrypWiARU3K3r+WWq09sHKFxgVvkVK6cotir/qd668kfVzWVa8IQ/vciCmS3nXDBwfjS ock0IBvF/2EKxDztKBv7j3ifOp651b684Zorty0Ci21Vnhgq2vaz+awYwyGrbLX6KZZr tjOQHwn0lkqTYUAuxTsyDEi8vsnbXaPKxaoVTRGqabeU3J6OqNHwGku5UqIE7WECpvK1 kHlg== X-Received: by 10.60.141.9 with SMTP id rk9mr9891483oeb.12.1399604180722; Thu, 08 May 2014 19:56:20 -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> <536c40b5e5333_741a161d310e2@nysa.notmuch> From: Wael Nasreddine Date: Fri, 09 May 2014 02:56:18 +0000 Message-ID: Subject: Re: Github? To: Felipe Contreras , "W. Trevor King" Content-Type: multipart/alternative; boundary=047d7b3a9cac04a9f404f8eebe0c 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 02:56:26 -0000 --047d7b3a9cac04a9f404f8eebe0c Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Actually you can't have the .Travis.yml file in a separate branch, Travis require it present in the context that it is testing (commits to all branches) On Thursday, May 8, 2014 7:53:52 PM, Felipe Contreras < felipe.contreras@gmail.com> wrote: > 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 > owning > > > 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 = use > > github/master as the base for some feature: > > > > -o---o---o---A notmuch/master > > \ > > B github/master > > \ > > C---o---o some-feature > > That wouldn't be a problem if HEAD didn't point to 'master' but to > 'upstream' which would be 'notmuch/master'. > > Or if the branch with the modifications was called something else, like > 'travis-ci'. > > -- > Felipe Contreras --047d7b3a9cac04a9f404f8eebe0c Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Actually you can't have the .Travis.yml file in a separate branch, Trav= is require it present in the context that it is testing (commits to all bra= nches)

On Thursday, May 8, 2014 7:53:52 PM, Felipe Contreras &l= t;felipe.contreras@gmail.com<= /a>> wrote:
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= owning
> > and maintaining the GitHub repo it is yours, besides I have not d= one
> > anything with the history I only added one commit which will neve= r conflict
> > with upstream unless you add a .Travis.yml file :)
>
> I don't think merge conflicts are the problem here. =C2=A0If the G= itHub
> 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=A0= github/master
>
> Someone who takes the =E2=80=9Cmirror=E2=80=9D claim at face value may= use
> 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=A0= github/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

That wouldn't be a problem if HEAD didn't point to 'master'= but to
'upstream' which would be 'notmuch/master'.

Or if the branch with the modifications was called something else, like
'travis-ci'.

--
Felipe Contreras
--047d7b3a9cac04a9f404f8eebe0c--