[notmuch] Git ancestry and sync problems (was: Mail in git)

diff --git a/f9/6444663bb5db984e748831beb85981946ae67c b/f9/6444663bb5db984e748831beb85981946ae67c
new file mode 100644 (file)
index 0000000..e96ce82
--- /dev/null
+++ b/f9/6444663bb5db984e748831beb85981946ae67c
@@ -0,0 +1,111 @@
+Return-Path: <madduck@lapse.rw.madduck.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id C7D0E431FBC\r
+       for <notmuch@notmuchmail.org>; Wed, 17 Feb 2010 18:11:36 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.04\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.04 tagged_above=-999 required=5 tests=[AWL=0.559, \r
+       BAYES_00=-2.599] autolearn=ham\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id ANz1XMho8-pw for <notmuch@notmuchmail.org>;\r
+       Wed, 17 Feb 2010 18:11:35 -0800 (PST)\r
+Received: from clegg.madduck.net (clegg.madduck.net [193.242.105.96])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8670E431FAE\r
+       for <notmuch@notmuchmail.org>; Wed, 17 Feb 2010 18:11:35 -0800 (PST)\r
+Received: from lapse.rw.madduck.net (unknown\r
+       [IPv6:2404:130:0:1000:20a:e4ff:fe30:4316])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (Client CN "lapse.rw.madduck.net",\r
+       Issuer "CAcert Class 3 Root" (verified OK))\r
+       by clegg.madduck.net (postfix) with ESMTPS id 7F0861D409C;\r
+       Thu, 18 Feb 2010 03:11:28 +0100 (CET)\r
+Received: by lapse.rw.madduck.net (Postfix, from userid 1000)\r
+       id D4E80756; Thu, 18 Feb 2010 15:11:28 +1300 (NZDT)\r
+Date: Thu, 18 Feb 2010 15:11:28 +1300\r
+From: martin f krafft <madduck@madduck.net>\r
+To: Ben Gamari <bgamari@gmail.com>, notmuch <notmuch@notmuchmail.org>\r
+Message-ID: <20100218021128.GB7650@lapse.rw.madduck.net>\r
+Mail-Followup-To: Ben Gamari <bgamari@gmail.com>,\r
+       notmuch <notmuch@notmuchmail.org>\r
+References: <20100215002914.GA22402@flamingspork.com>\r
+       <20100217012101.GD8249@lapse.rw.madduck.net>\r
+       <87ljerju0q.fsf@willster.local.flamingspork.com>\r
+       <1266453575-sup-3653@ben-laptop>\r
+       <20100218020035.GC3480@lapse.rw.madduck.net>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; micalg=pgp-ripemd160;\r
+       protocol="application/pgp-signature"; boundary="MW5yreqqjyrRcusr"\r
+Content-Disposition: inline\r
+In-Reply-To: <20100218020035.GC3480@lapse.rw.madduck.net>\r
+X-Motto: Keep the good times rollin'\r
+X-OS: Debian GNU/Linux squeeze/sid kernel 2.6.32-1-686 i686\r
+X-Spamtrap: madduck.bogus@madduck.net\r
+X-Subliminal-Message: debian/rules!\r
+User-Agent: Mutt/1.5.20 (2009-06-14)\r
+X-Virus-Scanned: clamav-milter 0.95.3 at clegg\r
+X-Virus-Status: Clean\r
+Subject: [notmuch] Git ancestry and sync problems (was:  Mail in git)\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 18 Feb 2010 02:11:36 -0000\r
+\r
+\r
+--MW5yreqqjyrRcusr\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+also sprach martin f krafft <madduck@madduck.net> [2010.02.18.1500 +1300]:\r
+> > > If we keep ancestry though, we are reusing existing working code for\r
+> > > backup (git-pull :)\r
+> >=20\r
+> > This is one of the reasons I feel it's important we keep it. And as is\r
+> > stated below, the storage overhead is minimal.\r
+>=20\r
+> Absolutely; Stewart mentioned at LCA to forego the porcelain and\r
+> harness the power of the plumbing, and I knew back then that this\r
+> would be among the first things of which to convince him once he had\r
+> the basic idea out. ;)\r
+\r
+Except I fear that as soon as we allow manipulation of the local\r
+store, we'll potentially run into this problem:\r
+\r
+  http://notmuchmail.org/pipermail/notmuch/2010/001114.html\r
+  id:20100112045152.GA15275@lapse.rw.madduck.net\r
+\r
+--=20\r
+martin | http://madduck.net/ | http://two.sentenc.es/\r
+=20\r
+it's as bad as you think, and they are out to get you.\r
+=20\r
+spamtraps: madduck.bogus@madduck.net\r
+\r
+--MW5yreqqjyrRcusr\r
+Content-Type: application/pgp-signature; name="digital_signature_gpg.asc"\r
+Content-Description: Digital signature (see http://martin-krafft.net/gpg/)\r
+Content-Disposition: inline\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.10 (GNU/Linux)\r
+\r
+iEYEAREDAAYFAkt8odAACgkQIgvIgzMMSnVycwCghvBtB4PYDd17n3YV8D58AWuX\r
+KcMAoMiEdsAXdsnIS31qm67ZzqUZreni\r
+=VSUy\r
+-----END PGP SIGNATURE-----\r
+\r
+--MW5yreqqjyrRcusr--\r