--- /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 1CD3B431FBC\r
+ for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 12:51:19 -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 4FHwLdGFNKVp for <notmuch@notmuchmail.org>;\r
+ Tue, 22 Oct 2013 12:51:13 -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 9A696431FDF\r
+ for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 12:51:07 -0700 (PDT)\r
+X-AuditID: 12074424-b7f528e0000009aa-a0-5266d72a6726\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 38.D9.02474.A27D6625; Tue, 22 Oct 2013 15:51:06 -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 r9MJp3kU016700; \r
+ Tue, 22 Oct 2013 15:51:04 -0400\r
+Received: from drake.dyndns.org (31-33-57.wireless.csail.mit.edu\r
+ [128.31.33.57]) (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 r9MJp1KR005200\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Tue, 22 Oct 2013 15:51:03 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1VYhyn-0006yp-4U; Tue, 22 Oct 2013 15:51:01 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 6/8] pick: Use list form of tag-changes in test\r
+Date: Tue, 22 Oct 2013 15:50:55 -0400\r
+Message-Id: <1382471457-26056-7-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+In-Reply-To: <1382471457-26056-1-git-send-email-amdragon@mit.edu>\r
+References: <1382471457-26056-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixG6noqt1PS3IYMo0JYvrN2cyOzB6PFt1\r
+ izmAMYrLJiU1J7MstUjfLoEro/noU+aCXoGK+6vLGxgn8nYxcnJICJhIfPm8gh3CFpO4cG89\r
+ G4gtJLCPUaLhh1AXIxeQvZFR4t7vC8wQzjEmiYnHXkI5cxkl1kz9xwLSwiagIbFt/3JGEFtE\r
+ QFpi593ZrF2MHBzMAmoSf7pUQMLCAvYSh1+9BythEVCVuLe4nRnE5hVwkDg+9woLxBVKEgtP\r
+ bWMFsTkFHCWm7/vHBjJGCKjm1B2OCYz8CxgZVjHKpuRW6eYmZuYUpybrFicn5uWlFuma6+Vm\r
+ luilppRuYgQHjIvKDsbmQ0qHGAU4GJV4eB+0pAUJsSaWFVfmHmKU5GBSEuWNuAoU4kvKT6nM\r
+ SCzOiC8qzUktPsQowcGsJMLb7AuU401JrKxKLcqHSUlzsCiJ897isA8SEkhPLEnNTk0tSC2C\r
+ ycpwcChJ8ApdA2oULEpNT61Iy8wpQUgzcXCCDOcBGn4MZDFvcUFibnFmOkT+FKOilDivMEiz\r
+ AEgiozQPrhcW0a8YxYFeEeZ1AKniASYDuO5XQIOZgAZPWQI2uCQRISXVwGijt3qy7TqZAzxr\r
+ Y9a7P4mcfXPaZjndpVO1VDZVHn0706Ot7KDQuu2r5rr93HzzVMtk3j+G13Pux6ZkPNUvrP7a\r
+ GPy+5kCmwGKJh1GxWf5R6VFP1e9bML55p2Ii1T53TeS1KolddzQPBdYer+2Y6ZEnXnjzdsTx\r
+ E6L/ZAr4I996tirL7z7hq6vEUpyRaKjFXFScCABk0n/gwwIAAA==\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: Tue, 22 Oct 2013 19:51:19 -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