From aaadd5c76cbc197932d9173a8b30927c93cf84f6 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 9 May 2014 16:49:45 +1700 Subject: [PATCH] Re: Github? --- 08/f5881353e4f5df2d6e7a0798ddb2539f522e0f | 163 ++++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 08/f5881353e4f5df2d6e7a0798ddb2539f522e0f diff --git a/08/f5881353e4f5df2d6e7a0798ddb2539f522e0f b/08/f5881353e4f5df2d6e7a0798ddb2539f522e0f new file mode 100644 index 000000000..48e94288b --- /dev/null +++ b/08/f5881353e4f5df2d6e7a0798ddb2539f522e0f @@ -0,0 +1,163 @@ +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 E281D431FBF + for ; Thu, 8 May 2014 16:49:52 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.1 +X-Spam-Level: +X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + RCVD_IN_DNSWL_NONE=-0.0001] 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 V-7kdiWph00V for ; + Thu, 8 May 2014 16:49:47 -0700 (PDT) +Received: from qmta03.westchester.pa.mail.comcast.net + (qmta03.westchester.pa.mail.comcast.net [76.96.62.32]) + by olra.theworths.org (Postfix) with ESMTP id 89029431FAE + for ; Thu, 8 May 2014 16:49:47 -0700 (PDT) +Received: from omta24.westchester.pa.mail.comcast.net ([76.96.62.76]) + by qmta03.westchester.pa.mail.comcast.net with comcast + id zbll1n0051ei1Bg53bpnDm; Thu, 08 May 2014 23:49:47 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by omta24.westchester.pa.mail.comcast.net with comcast + id zbpl1n00l152l3L3kbpmXX; Thu, 08 May 2014 23:49:47 +0000 +Received: by odin.tremily.us (Postfix, from userid 1000) + id 43A5F11946BE; Thu, 8 May 2014 16:49:45 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; + t=1399592985; bh=zNR6umMhhVQNaASUChVI+V5bcUrT5N6C5yVfBor5FoA=; + h=Date:From:To:Cc:Subject:References:In-Reply-To; + b=gizuZtMnqRgZPlJGm1Ho+RjGnfn9yNdBpB7h6LMxjRaOWaH2i7YpMw9pVP8KX9Nai + 8OeMM9s706td6iJJkhFjvin5RmfGwSEyNXrw5+E2uocKw4mXufAy+9l5dvMDzHkl2Z + 6YVcMifYRv4NXqRTdC/evuI1BKl9NYqhv/vgRFi8= +Date: Thu, 8 May 2014 16:49:45 -0700 +From: "W. Trevor King" +To: Wael Nasreddine +Subject: Re: Github? +Message-ID: <20140508234945.GW28634@odin.tremily.us> +References: + + <87iopgkaiz.fsf@nikula.org> + <20140508101325.GC23124@vilya.m0g.net> + + <874n0zvqrx.fsf@maritornes.cs.unb.ca> + +MIME-Version: 1.0 +Content-Type: multipart/signed; micalg=pgp-sha1; + protocol="application/pgp-signature"; boundary="b6rSbt24+kIAbQdu" +Content-Disposition: inline +In-Reply-To: + +OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8; + url=http://tremily.us/pubkey.txt +User-Agent: Mutt/1.5.23 (2014-03-12) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20140121; t=1399592987; + bh=pApQztUV123lOLcChOut7FY4XV7u8xS4WDLLWrPPNWY=; + h=Received:Received:Received:Date:From:To:Subject:Message-ID: + MIME-Version:Content-Type; + b=Ue/UJOTvPeY2Kuu9yJ35wdOW00GctvKuaon5hUhyJczg+B/R3ztEOzQuHRMApOmZE + Aa8dikQfioPRkcgNKmYYVybTBVWhAzP2YnMR03M55o+zUSjEDvNIXK4MuGpOeYH3ok + HLyYOeZminF34vD2bNbP6JxBeqas7u7n58tqfLDlI+yMbMUcEHoNXN0iVAAmUYuhIl + SLuaSxX5UVf1SNprgAHZQGW1wheloAxqNq9+t51eDhObmLCWYbOSKRom6roNMaaKb9 + r56Hpp6apxF8PEoprhrUjYba7p7W7PI2PVqvZy9dx26RvxapM4O0AsnqNa1XWSwA2P + AFYYc1l9hc/aw== +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: Thu, 08 May 2014 23:49:54 -0000 + + +--b6rSbt24+kIAbQdu +Content-Type: text/plain; charset=utf-8 +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +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 confli= +ct +> 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 + +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 follo= +wing 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 + +--=20 +This email may be signed or encrypted with GnuPG (http://www.gnupg.org). +For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy + +--b6rSbt24+kIAbQdu +Content-Type: application/pgp-signature; name="signature.asc" +Content-Description: OpenPGP digital signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAEBAgAGBQJTbBgWAAoJEKKfehoaNkbtIA8QAKzc95pEi5Ddcs91KQ/UYkKS +iaqwdAbFRoh2kzJZbpBBzGPhvSyTFHr0eTSXr0o5EVfIdqMc610qtU0GmeRjztzj +o1+gIst9C/JqWXcaxlH3Vqiaf9bbhJ8UtGLjMoGLcc8cudAvF97UG4pual802kND +Q35RDfQ1HJpMuzrQVWI5A4RjL/BB5r66lLO4r8jl1HqmpKIl3kLTJG6kbHVhH2Ap +W19qj0dPO8zBQSKTMbRoDnBlsh1eHrkWP5tINAi5TKFuK+nLeLXw+OAItDCoLpQ7 +fX6H4Z8nBs0cehVWVUtjzpruu9jyOyW2/0CFhO3Go0knHfH7kOW6r56CxRwWXewG +k4eMvD58roIGr4Pb3bnBucPClyukondCOt0dV7loUTJLuY2+dpQIj7YnjhTlhqjj +uuBYrx8dPPxpyK0hq1q3ThNJ3Zwg/HtTDo1cYK9XiT16Ah3jfXCX2bppJ/ihL+w+ +h9s4HenYhlKRYKmEYvo0tDO5mZ8kUUZcXWi0NP94rDJv3EZjF/1QxJ/ykW1OcxKO +nMqi8JH0dADPPwX/IgjK92H4vJgNhwsVW1v++Uo8HFxR23CdL0e3iy9VmVOtSvIH +awuiII3PfZFFcixpuUCscYhKc5ESrSakA9VVBYzju8S+Ml5VafnVVKrVMi78L/E3 +8RA5z6cbJXrSxYxocFt4 +=jDKj +-----END PGP SIGNATURE----- + +--b6rSbt24+kIAbQdu-- -- 2.26.2