Return-Path: <felipe.contreras@gmail.com>
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 662D6431FBF
	for <notmuch@notmuchmail.org>; Thu,  8 May 2014 19:53:58 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: -0.799
X-Spam-Level: 
X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
	tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
	FREEMAIL_FROM=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 t6zBJrSqm+Ft for <notmuch@notmuchmail.org>;
	Thu,  8 May 2014 19:53:54 -0700 (PDT)
Received: from mail-yk0-f181.google.com (mail-yk0-f181.google.com
	[209.85.160.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id F0031431FAE
	for <notmuch@notmuchmail.org>; Thu,  8 May 2014 19:53:53 -0700 (PDT)
Received: by mail-yk0-f181.google.com with SMTP id 131so2951531ykp.40
	for <notmuch@notmuchmail.org>; Thu, 08 May 2014 19:53:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=date:from:to:cc:message-id:in-reply-to:references:subject
	:mime-version:content-type:content-transfer-encoding;
	bh=/XxYNXa49ANaw2ubcVxaOS7h7eAlTPJKIOh/9N715po=;
	b=ediSWlSknEvT2IViv8XiheqwPSvADdQkomKrImJE45UYrQWrDrmakZKqjBJFRIp6yz
	MCA6mxAa18D7AnAipahjq7/vCMS3/TM0WemnR9/lmjx/pYxZsjpo3VQnK7T3NMs7Mifm
	ZTd3lOmd9xWvm9pEW59gKHeU1kt45e5CaGU5BiDbde52I/b4294dMe7a+HwjgruGLfsd
	QhhD5L9FDW6jJ8KC6XaWOYy41tq33wmjpA0IzDdbHBE5CzMVsIecD9KG/MJxWy6/IuKy
	dTbWP9GJRfvf2omr5ttZHk8iw0x/hQF/Go9bmwt95C9m2FUQgFzDx1i25RpoCL8QOEXQ
	ztuA==
X-Received: by 10.236.166.169 with SMTP id g29mr10361517yhl.135.1399604032279;
 	Thu, 08 May 2014 19:53:52 -0700 (PDT)
Received: from localhost (189-211-224-40.static.axtel.net. [189.211.224.40])
	by mx.google.com with ESMTPSA id d43sm4275980yhb.10.2014.05.08.19.53.48
	for <multiple recipients>
	(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
	Thu, 08 May 2014 19:53:51 -0700 (PDT)
Date: Thu, 08 May 2014 21:43:01 -0500
From: Felipe Contreras <felipe.contreras@gmail.com>
To: "W. Trevor King" <wking@tremily.us>, 
	Wael Nasreddine <wael.nasreddine@gmail.com>
Message-ID: <536c40b5e5333_741a161d310e2@nysa.notmuch>
In-Reply-To: <20140508234945.GW28634@odin.tremily.us>
References:
 <CA+kKtKAw=nEn2dfcvF6++gD5ng+S3T8SLAdVL=Hs=EsvwUg6aw@mail.gmail.com>
	<87iopgkaiz.fsf@nikula.org> <E1WiJsj-0004mz-VK@teckel.deptj.eu>
	<20140508101325.GC23124@vilya.m0g.net>
	<CA+kKtKA8Q5z6Pys9RAumLTiJvmGwWYKGXDkKr9Mh_6ecV-7sdA@mail.gmail.com>
	<874n0zvqrx.fsf@maritornes.cs.unb.ca>
	<CA+kKtKBSP0RYRy6GgEWcqTsAm_CzkN7zJfkjfwAgq8HqoyU+WQ@mail.gmail.com>
	<20140508234945.GW28634@odin.tremily.us>
Subject: Re: Github?
Mime-Version: 1.0
Content-Type: text/plain;
 charset=utf-8
Content-Transfer-Encoding: quoted-printable
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."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Fri, 09 May 2014 02:53:58 -0000

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 own=
ing
> > 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 co=
nflict
> > 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=