notmuch restore --include=config --accumulate

diff --git a/02/6659efc0c4ea41d7210b3f16a01078765482b5 b/02/6659efc0c4ea41d7210b3f16a01078765482b5
new file mode 100644 (file)
index 0000000..3f6bd57
--- /dev/null
+++ b/02/6659efc0c4ea41d7210b3f16a01078765482b5
@@ -0,0 +1,63 @@
+Return-Path: <david@tethera.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 arlo.cworth.org (Postfix) with ESMTP id 3C0C06DE01F7\r
+ for <notmuch@notmuchmail.org>; Sun,  5 Jun 2016 05:34:25 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.012\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.012 tagged_above=-999 required=5\r
+ tests=[AWL=-0.001, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id pN13_qA7JAIM for <notmuch@notmuchmail.org>;\r
+ Sun,  5 Jun 2016 05:34:17 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 6EE646DE01D0\r
+ for <notmuch@notmuchmail.org>; Sun,  5 Jun 2016 05:34:17 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <david@tethera.net>)\r
+ id 1b9XFk-0005zv-1r; Sun, 05 Jun 2016 08:34:04 -0400\r
+Received: (nullmailer pid 10585 invoked by uid 1000);\r
+ Sun, 05 Jun 2016 12:34:13 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: notmuch restore --include=config --accumulate\r
+User-Agent: Notmuch/0.22+28~gb9bf3f4 (http://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 05 Jun 2016 09:34:13 -0300\r
+Message-ID: <87lh2jddbu.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 05 Jun 2016 12:34:25 -0000\r
+\r
+\r
+Recently notmuch-restore gained the option to restore configuration\r
+information (--include=config). One potentially surprising aspect is\r
+that it behaves as if --accumulate was given for config data, even if\r
+replacing all the tags on each message. To be precise, if some config\r
+data is in the database, and not mentioned in the input to restore, it\r
+will still be there afterwards. I lean towards this being a feature\r
+rather than a bug, since I think it would be even more surprising to\r
+have the config data wiped out. I guess not many people use this feature\r
+yet (or even know about it), so we can still change this behaviour. Or\r
+at least document it better.  A lawyerly reading of the docs is\r
+consistent with the current behaviour, but it is a bit misleading (as\r
+with all good lawyerly things).\r
+\r
+d\r