--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 4064D431FBF\r
+ for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 17:22:20 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\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 uqVsi+FxvrTO for <notmuch@notmuchmail.org>;\r
+ Tue, 22 Oct 2013 17:22:14 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu\r
+ [18.7.68.36])\r
+ by olra.theworths.org (Postfix) with ESMTP id EC11E431FDE\r
+ for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 17:22:07 -0700 (PDT)\r
+X-AuditID: 12074424-b7f528e0000009aa-42-526716af0628\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 03.2A.02474.FA617625; Tue, 22 Oct 2013 20:22:07 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id r9N0M5iR013714; \r
+ Tue, 22 Oct 2013 20:22:05 -0400\r
+Received: from drake.dyndns.org\r
+ (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [216.15.114.40]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r9N0M3eI005847\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Tue, 22 Oct 2013 20:22:04 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1VYmD5-0008KQ-RW; Tue, 22 Oct 2013 20:22:03 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 6/8] pick: Use list form of tag-changes in test\r
+Date: Tue, 22 Oct 2013 20:21:59 -0400\r
+Message-Id: <1382487721-31776-7-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+In-Reply-To: <1382487721-31776-1-git-send-email-amdragon@mit.edu>\r
+References: <1382487721-31776-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixG6norteLD3IYNdcaYvVc3ksrt+cyezA\r
+ 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZTQffcpc0CtQcX91eQPjRN4uRk4OCQETiRub\r
+ VrBD2GISF+6tZ+ti5OIQEtjHKPHvTA+Us5FRYubi1ywQzh0miX1/XkBl5jJKfH20gAWkn01A\r
+ Q2Lb/uWMILaIgLTEzruzWUFsZgFHic/7F7GB2MICThIrp/1nArFZBFQluhduBavhFXCQ6Dy4\r
+ F+oOJYmFp7aBxTmBet/s+ADWKwRUM2XnGZYJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW\r
+ 6Zrr5WaW6KWmlG5iBAeSi8oOxuZDSocYBTgYlXh4H7SkBQmxJpYVV+YeYpTkYFIS5VXnTw8S\r
+ 4kvKT6nMSCzOiC8qzUktPsQowcGsJMLb7AtUzpuSWFmVWpQPk5LmYFES573FYR8kJJCeWJKa\r
+ nZpakFoEk5Xh4FCS4PUVBRoqWJSanlqRlplTgpBm4uAEGc4DNDwPpIa3uCAxtzgzHSJ/ilFR\r
+ SpzXByQhAJLIKM2D64VF+itGcaBXhHkNQap4gEkCrvsV0GAmoMFTloBcXVySiJCSamAsjuf9\r
+ 6/2972To5feHhD7suHX8lIC/z6lFS5YcW7TVbRrnhaz9cfxqsnO91VNFNRdbr8zm2PfNcq/R\r
+ F4n0rc8nVTP2X0wQm8cxr1blWZH3ZJHNwYe2xQaq1bN8yVTtXDZTO9vgtoXdq2/2T7V2vvlQ\r
+ u/du4m6tG4JSRRu/6H3avMzd/W5Xn7OdEktxRqKhFnNRcSIA4rndxs8CAAA=\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: Wed, 23 Oct 2013 00:22:20 -0000\r
+\r
+Currently we support both string and list forms of tag-changes for\r
+historical reasons. This is about to change, so fix pick's tests that\r
+use the legacy string form of tag-changes.\r
+---\r
+ contrib/notmuch-pick/test/emacs-pick | 8 ++++----\r
+ 1 file changed, 4 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/test/emacs-pick b/contrib/notmuch-pick/test/emacs-pick\r
+index a802d0e..40b0738 100755\r
+--- a/contrib/notmuch-pick/test/emacs-pick\r
++++ b/contrib/notmuch-pick/test/emacs-pick\r
+@@ -44,7 +44,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (notmuch-pick "tag:inbox")\r
+ (notmuch-test-wait)\r
+ (forward-line)\r
+- (notmuch-pick-tag "+test_tag")\r
++ (notmuch-pick-tag (list "+test_tag"))\r
+ (test-output)\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox-tagged\r
+@@ -59,7 +59,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (notmuch-pick "tag:inbox")\r
+ (notmuch-test-wait)\r
+ (forward-line)\r
+- (notmuch-pick-tag "-test_tag")\r
++ (notmuch-pick-tag (list "-test_tag"))\r
+ (test-output)\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox\r
+@@ -75,7 +75,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (notmuch-test-wait)\r
+ ;; move to a sizable thread\r
+ (forward-line 26)\r
+- (notmuch-pick-tag-thread "+test_thread_tag")\r
++ (notmuch-pick-tag-thread (list "+test_thread_tag"))\r
+ (test-output)\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox-thread-tagged\r
+@@ -98,7 +98,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (notmuch-test-wait)\r
+ ;; move to the same sizable thread as above\r
+ (forward-line 26)\r
+- (notmuch-pick-tag-thread "-test_thread_tag")\r
++ (notmuch-pick-tag-thread (list "-test_thread_tag"))\r
+ (test-output)\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox\r
+-- \r
+1.8.4.rc3\r
+\r