06/130192e46503128e887ebca63ef743dc8a546d

   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 8228C431FBF\r
   6         for <notmuch@notmuchmail.org>; Thu,  8 May 2014 20:02:06 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.1\r
  10 X-Spam-Level: \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 Q9gbLYmY70qg for <notmuch@notmuchmail.org>;\r
  17         Thu,  8 May 2014 20:02:00 -0700 (PDT)\r
  18 Received: from qmta08.westchester.pa.mail.comcast.net\r
  19         (qmta08.westchester.pa.mail.comcast.net [76.96.62.80])\r
  20         by olra.theworths.org (Postfix) with ESMTP id 48DC3431FAE\r
  21         for <notmuch@notmuchmail.org>; Thu,  8 May 2014 20:02:00 -0700 (PDT)\r
  22 Received: from omta10.westchester.pa.mail.comcast.net ([76.96.62.28])\r
  23         by qmta08.westchester.pa.mail.comcast.net with comcast\r
  24         id zeVp1n0040cZkys58f1zb6; Fri, 09 May 2014 03:01:59 +0000\r
  25 Received: from odin.tremily.us ([24.18.63.50])\r
  26         by omta10.westchester.pa.mail.comcast.net with comcast\r
  27         id zf1x1n00B152l3L3Wf1ztZ; Fri, 09 May 2014 03:01:59 +0000\r
  28 Received: by odin.tremily.us (Postfix, from userid 1000)\r
  29         id 6FD42119498B; Thu,  8 May 2014 20:01:56 -0700 (PDT)\r
  30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;\r
  31         t=1399604516; bh=QGjC6Q0Ro7l/WyfjuC247UyUDc0DuZ0iLQeQ4e/KASM=;\r
  32         h=Date:From:To:Cc:Subject:References:In-Reply-To;\r
  33         b=E2PO4z2UL8GgNBaj+Pt2GLIqV7XpNjP6WEBVvcUDP/4c+Vt08/rx6u0dMRvMDY5cu\r
  34         VAg83ta8MFsgg8jc5uTeg29FexVNqJNDkxfNFA2sOtKMXibjYYRB5GKAmiHfX96/Dz\r
  35         ELHVR34NuPeIamO+DSqt0Ap18pvFIlRKS4MEw18k=\r
  36 Date: Thu, 8 May 2014 20:01:56 -0700\r
  37 From: "W. Trevor King" <wking@tremily.us>\r
  38 To: Felipe Contreras <felipe.contreras@gmail.com>\r
  39 Subject: Re: Github?\r
  40 Message-ID: <20140509030156.GY28634@odin.tremily.us>\r
  41 References:\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
  48         <20140508234945.GW28634@odin.tremily.us>\r
  49         <536c40b5e5333_741a161d310e2@nysa.notmuch>\r
  50 MIME-Version: 1.0\r
  51 Content-Type: multipart/signed; micalg=pgp-sha1;\r
  52         protocol="application/pgp-signature"; boundary="U6ZV60npyt4sCA+1"\r
  53 Content-Disposition: inline\r
  54 In-Reply-To: <536c40b5e5333_741a161d310e2@nysa.notmuch>\r
  55 OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;\r
  56         url=http://tremily.us/pubkey.txt\r
  57 User-Agent: Mutt/1.5.23 (2014-03-12)\r
  58 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
  59         s=q20140121; t=1399604519;\r
  60         bh=cl97eVs5ZSnEMFsLKH1CpxtN6r4nzw8phQktKiSFt6g=;\r
  61         h=Received:Received:Received:Date:From:To:Subject:Message-ID:\r
  62         MIME-Version:Content-Type;\r
  63         b=JFJooPSZHe8JEVzCNwEl6eJnb8H7zw+QB1sihItO8EXmas5zuWUkvHbyYxzuhdrh/\r
  64         AO36yS30xbS6fwekYu+eE6jkNBRwAaj58LQ7g9LPRNQU/7ATUVw0u6iLdtKeIwWjJu\r
  65         BLBWU1+PvyWwguvnCfBPFLC2+XgZjoNCZnJ8vf5yg/JHsgxXR0eIYgE3UGOpyM+/Dc\r
  66         EN3zczNyoPVv8msZiXmgITr4TXVe8GiEJvulO/S5TJ8HVS8Pi6c8i2xjR3/+GU6H7w\r
  67         bpKbiKYXnDc9vVTxoYeclFRDjN3AsROUSrJctC9wgJXCQwawVcBK7LiMHGhzvfDtZf\r
  68         oKcZ2Y9fHLYJg==\r
  69 Cc: notmuch@notmuchmail.org\r
  70 X-BeenThere: notmuch@notmuchmail.org\r
  71 X-Mailman-Version: 2.1.13\r
  72 Precedence: list\r
  73 List-Id: "Use and development of the notmuch mail system."\r
  74         <notmuch.notmuchmail.org>\r
  75 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  76         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  77 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  78 List-Post: <mailto:notmuch@notmuchmail.org>\r
  79 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  80 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  81         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  82 X-List-Received-Date: Fri, 09 May 2014 03:02:06 -0000\r
  83 \r
  84 \r
  85 --U6ZV60npyt4sCA+1\r
  86 Content-Type: text/plain; charset=utf-8\r
  87 Content-Disposition: inline\r
  88 Content-Transfer-Encoding: quoted-printable\r
  89 \r
  90 On Thu, May 08, 2014 at 09:43:01PM -0500, Felipe Contreras wrote:\r
  91 > W. Trevor King wrote:\r
  92 > > I don't think merge conflicts are the problem here.  If the GitHub\r
  93 > > mirror claims to be a mirror but adds an additional commit B=E2=80=A6\r
  94 >=20\r
  95 > That wouldn't be a problem if HEAD didn't point to 'master' but to\r
  96 > 'upstream' which would be 'notmuch/master'.\r
  97 >=20\r
  98 > Or if the branch with the modifications was called something else,\r
  99 > like 'travis-ci'.\r
 100 \r
 101 Agreed.  The only problem I'd have is that you'd want to say that the\r
 102 GitHub repo was a mirror, since the primary repo would still be\r
 103 git://notmuchmail.org/git/notmuch.  If it's a mirror, I think it\r
 104 should mirror all refs on the main repo [1] without adding new ones.\r
 105 I'm happy for 'travis-ci' branches and whatnot in repositories that\r
 106 don't claim to mirror the notmuchmail.org repo.  I'm also happy to\r
 107 have the Travis config upstream (in any branch), in which case it\r
 108 would show up in the mirror.  I just don't think it's a good idea to\r
 109 have tweaks on a =E2=80=9Cmirror=E2=80=9D that aren't upstream, even if it =\r
 110 doesn't\r
 111 effect any upstream refs.\r
 112 \r
 113 Cheers,\r
 114 Trevor\r
 115 \r
 116 [1]: in the style of 'git clone --mirror =E2=80=A6'\r
 117 \r
 118 --=20\r
 119 This email may be signed or encrypted with GnuPG (http://www.gnupg.org).\r
 120 For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\r
 121 \r
 122 --U6ZV60npyt4sCA+1\r
 123 Content-Type: application/pgp-signature; name="signature.asc"\r
 124 Content-Description: OpenPGP digital signature\r
 125 \r
 126 -----BEGIN PGP SIGNATURE-----\r
 127 Version: GnuPG v2.0.22 (GNU/Linux)\r
 128 \r
 129 iQIcBAEBAgAGBQJTbEUiAAoJEKKfehoaNkbtZrYQALQySZqAb+BP3IJ7TkA4VQSI\r
 130 0PG27LGljpGAstM9YMebTQq0unTwfBFdwbIdiDnEZpQ6v4Gk2r3y6au2aLwh27FK\r
 131 w+hDJsB4F392IJmcIZ16OACTj2ZDwpF/fzOje0YFKeqNhm38aq0Zyrc36yeDbrHR\r
 132 Hts2/mEhX6tWoIdtI/rVVKCzeQ9nwlUAzkIjoWg0wLDFWIyv4dyCzr+S2/fmqjAM\r
 133 xjKBxeFumDhT7AvVcqNSufmq/VdjfBroDRQnzaUTZlI9s8xmUmfCjSZrR2IFArVM\r
 134 TSTKPjioAkiqlEr5KFvNq+KzROPNUmtWulrM/qhvkb+LsiBKjrL+ukGWZAT4KhO9\r
 135 RNjsF4noO/QaWfd7YcboILLX1iNtLR4tOYU/Uzzq+2PE7ho7QQmSGJ5M/+JCqKtw\r
 136 YD9EbNMa4dZaHVZQa6DruOBQYSXbif48hC2uYCdfJgxiiIQxvFo84Ugip3S0Xy6j\r
 137 AtdRNYyvKt1PsYrS+Iqdbv4PcshKBcCVqeXaY9QRgOXC/QDb5TcaLYR19Gz7vXoZ\r
 138 1SwS59BCScnwCGBg85+6sFA7K6E4e2+BA8xWf+PT3A5zAG5NE6tLf2/fMHq/MbpE\r
 139 c9HJq/7kQscw5t+3O2amhYaIGSWu6fPyQE/fpxyYMVpcxk2fpbr99oFFxpUecChE\r
 140 PgAn05uFrczNSW4VS0YH\r
 141 =m39h\r
 142 -----END PGP SIGNATURE-----\r
 143 \r
 144 --U6ZV60npyt4sCA+1--\r