1 Return-Path: <wking@tremily.us>
\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 E281D431FBF
\r
6 for <notmuch@notmuchmail.org>; Thu, 8 May 2014 16:49:52 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 RCVD_IN_DNSWL_NONE=-0.0001] 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 V-7kdiWph00V for <notmuch@notmuchmail.org>;
\r
17 Thu, 8 May 2014 16:49:47 -0700 (PDT)
\r
18 Received: from qmta03.westchester.pa.mail.comcast.net
\r
19 (qmta03.westchester.pa.mail.comcast.net [76.96.62.32])
\r
20 by olra.theworths.org (Postfix) with ESMTP id 89029431FAE
\r
21 for <notmuch@notmuchmail.org>; Thu, 8 May 2014 16:49:47 -0700 (PDT)
\r
22 Received: from omta24.westchester.pa.mail.comcast.net ([76.96.62.76])
\r
23 by qmta03.westchester.pa.mail.comcast.net with comcast
\r
24 id zbll1n0051ei1Bg53bpnDm; Thu, 08 May 2014 23:49:47 +0000
\r
25 Received: from odin.tremily.us ([24.18.63.50])
\r
26 by omta24.westchester.pa.mail.comcast.net with comcast
\r
27 id zbpl1n00l152l3L3kbpmXX; Thu, 08 May 2014 23:49:47 +0000
\r
28 Received: by odin.tremily.us (Postfix, from userid 1000)
\r
29 id 43A5F11946BE; Thu, 8 May 2014 16:49:45 -0700 (PDT)
\r
30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;
\r
31 t=1399592985; bh=zNR6umMhhVQNaASUChVI+V5bcUrT5N6C5yVfBor5FoA=;
\r
32 h=Date:From:To:Cc:Subject:References:In-Reply-To;
\r
33 b=gizuZtMnqRgZPlJGm1Ho+RjGnfn9yNdBpB7h6LMxjRaOWaH2i7YpMw9pVP8KX9Nai
\r
34 8OeMM9s706td6iJJkhFjvin5RmfGwSEyNXrw5+E2uocKw4mXufAy+9l5dvMDzHkl2Z
\r
35 6YVcMifYRv4NXqRTdC/evuI1BKl9NYqhv/vgRFi8=
\r
36 Date: Thu, 8 May 2014 16:49:45 -0700
\r
37 From: "W. Trevor King" <wking@tremily.us>
\r
38 To: Wael Nasreddine <wael.nasreddine@gmail.com>
\r
39 Subject: Re: Github?
\r
40 Message-ID: <20140508234945.GW28634@odin.tremily.us>
\r
42 <CA+kKtKAw=nEn2dfcvF6++gD5ng+S3T8SLAdVL=Hs=EsvwUg6aw@mail.gmail.com>
\r
43 <87iopgkaiz.fsf@nikula.org> <E1WiJsj-0004mz-VK@teckel.deptj.eu>
\r
44 <20140508101325.GC23124@vilya.m0g.net>
\r
45 <CA+kKtKA8Q5z6Pys9RAumLTiJvmGwWYKGXDkKr9Mh_6ecV-7sdA@mail.gmail.com>
\r
46 <874n0zvqrx.fsf@maritornes.cs.unb.ca>
\r
47 <CA+kKtKBSP0RYRy6GgEWcqTsAm_CzkN7zJfkjfwAgq8HqoyU+WQ@mail.gmail.com>
\r
49 Content-Type: multipart/signed; micalg=pgp-sha1;
\r
50 protocol="application/pgp-signature"; boundary="b6rSbt24+kIAbQdu"
\r
51 Content-Disposition: inline
\r
53 <CA+kKtKBSP0RYRy6GgEWcqTsAm_CzkN7zJfkjfwAgq8HqoyU+WQ@mail.gmail.com>
\r
54 OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;
\r
55 url=http://tremily.us/pubkey.txt
\r
56 User-Agent: Mutt/1.5.23 (2014-03-12)
\r
57 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;
\r
58 s=q20140121; t=1399592987;
\r
59 bh=pApQztUV123lOLcChOut7FY4XV7u8xS4WDLLWrPPNWY=;
\r
60 h=Received:Received:Received:Date:From:To:Subject:Message-ID:
\r
61 MIME-Version:Content-Type;
\r
62 b=Ue/UJOTvPeY2Kuu9yJ35wdOW00GctvKuaon5hUhyJczg+B/R3ztEOzQuHRMApOmZE
\r
63 Aa8dikQfioPRkcgNKmYYVybTBVWhAzP2YnMR03M55o+zUSjEDvNIXK4MuGpOeYH3ok
\r
64 HLyYOeZminF34vD2bNbP6JxBeqas7u7n58tqfLDlI+yMbMUcEHoNXN0iVAAmUYuhIl
\r
65 SLuaSxX5UVf1SNprgAHZQGW1wheloAxqNq9+t51eDhObmLCWYbOSKRom6roNMaaKb9
\r
66 r56Hpp6apxF8PEoprhrUjYba7p7W7PI2PVqvZy9dx26RvxapM4O0AsnqNa1XWSwA2P
\r
68 Cc: notmuch@notmuchmail.org
\r
69 X-BeenThere: notmuch@notmuchmail.org
\r
70 X-Mailman-Version: 2.1.13
\r
72 List-Id: "Use and development of the notmuch mail system."
\r
73 <notmuch.notmuchmail.org>
\r
74 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
75 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
76 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
77 List-Post: <mailto:notmuch@notmuchmail.org>
\r
78 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
79 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
80 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
81 X-List-Received-Date: Thu, 08 May 2014 23:49:54 -0000
\r
85 Content-Type: text/plain; charset=utf-8
\r
86 Content-Disposition: inline
\r
87 Content-Transfer-Encoding: quoted-printable
\r
89 On Thu, May 08, 2014 at 11:18:23PM +0000, Wael Nasreddine wrote:
\r
90 > Well like I said in my first email, if you guys are interested in owning
\r
91 > and maintaining the GitHub repo it is yours, besides I have not done
\r
92 > anything with the history I only added one commit which will never confli=
\r
94 > with upstream unless you add a .Travis.yml file :)
\r
96 I don't think merge conflicts are the problem here. If the GitHub
\r
97 mirror claims to be a mirror but adds an additional commit B:
\r
99 -o---o---o---A notmuch/master
\r
103 Someone who takes the =E2=80=9Cmirror=E2=80=9D claim at face value may use
\r
104 github/master as the base for some feature:
\r
106 -o---o---o---A notmuch/master
\r
110 C---o---o some-feature
\r
112 Now when they submit the patches to this list, they might send a patch
\r
113 series that drags in B (probably not what the some-feature author
\r
114 wanted). Alternatively, they might send a patch series starting with
\r
115 C and say =E2=80=9Cthis is based on B=E2=80=9D, and anyone who's only follo=
\r
117 main repo thinks, =E2=80=9CWhat is B? I don't have that commit.=E2=80=9D.
\r
119 You'll also have to continuously rebase github/master to keep A on top
\r
120 of notmuch/master, which means any feature branches built on
\r
121 github/master will *also* have to be continuously rebased:
\r
123 -o---o---o---A---D notmuch/master
\r
127 B'---o---o some-feature
\r
129 Keeping a fork with commits that aren't upstream is fine, and
\r
130 maintaining a fork with an additional .Travis.yml file will probably
\r
131 be pretty easy, but calling that fork a mirror is going to cause
\r
132 needless confusion.
\r
138 This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
\r
139 For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
\r
142 Content-Type: application/pgp-signature; name="signature.asc"
\r
143 Content-Description: OpenPGP digital signature
\r
145 -----BEGIN PGP SIGNATURE-----
\r
146 Version: GnuPG v2.0.22 (GNU/Linux)
\r
148 iQIcBAEBAgAGBQJTbBgWAAoJEKKfehoaNkbtIA8QAKzc95pEi5Ddcs91KQ/UYkKS
\r
149 iaqwdAbFRoh2kzJZbpBBzGPhvSyTFHr0eTSXr0o5EVfIdqMc610qtU0GmeRjztzj
\r
150 o1+gIst9C/JqWXcaxlH3Vqiaf9bbhJ8UtGLjMoGLcc8cudAvF97UG4pual802kND
\r
151 Q35RDfQ1HJpMuzrQVWI5A4RjL/BB5r66lLO4r8jl1HqmpKIl3kLTJG6kbHVhH2Ap
\r
152 W19qj0dPO8zBQSKTMbRoDnBlsh1eHrkWP5tINAi5TKFuK+nLeLXw+OAItDCoLpQ7
\r
153 fX6H4Z8nBs0cehVWVUtjzpruu9jyOyW2/0CFhO3Go0knHfH7kOW6r56CxRwWXewG
\r
154 k4eMvD58roIGr4Pb3bnBucPClyukondCOt0dV7loUTJLuY2+dpQIj7YnjhTlhqjj
\r
155 uuBYrx8dPPxpyK0hq1q3ThNJ3Zwg/HtTDo1cYK9XiT16Ah3jfXCX2bppJ/ihL+w+
\r
156 h9s4HenYhlKRYKmEYvo0tDO5mZ8kUUZcXWi0NP94rDJv3EZjF/1QxJ/ykW1OcxKO
\r
157 nMqi8JH0dADPPwX/IgjK92H4vJgNhwsVW1v++Uo8HFxR23CdL0e3iy9VmVOtSvIH
\r
158 awuiII3PfZFFcixpuUCscYhKc5ESrSakA9VVBYzju8S+Ml5VafnVVKrVMi78L/E3
\r
159 8RA5z6cbJXrSxYxocFt4
\r
161 -----END PGP SIGNATURE-----
\r
163 --b6rSbt24+kIAbQdu--
\r