--- /dev/null
+Return-Path: <bremner@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 olra.theworths.org (Postfix) with ESMTP id 1C117431E82\r
+ for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:14:44 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ 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 Dbi1YWtgGtCG for <notmuch@notmuchmail.org>;\r
+ Tue, 11 Mar 2014 16:14:39 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+ (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 10CC3431FDF\r
+ for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:14:39 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1WNVsc-00022X-7h; Tue, 11 Mar 2014 20:14:38 -0300\r
+Received: (nullmailer pid 1247 invoked by uid 1000); Tue, 11 Mar 2014\r
+ 23:14:34 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: rearrange the test corpus into subfolders, fix tests\r
+Date: Tue, 11 Mar 2014 20:14:27 -0300\r
+Message-Id: <1394579667-1179-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1394578900-25618-3-git-send-email-david@tethera.net>\r
+References: <1394578900-25618-3-git-send-email-david@tethera.net>\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, 11 Mar 2014 23:14:44 -0000\r
+\r
+From: Jani Nikula <jani@nikula.org>\r
+\r
+We will need this for improved folder search tests, but having some\r
+folders should exercise our code paths better anyway.\r
+\r
+Modify the relevant test accordingly to make it pass.\r
+\r
+This reorganization triggers a bug in the test suite, namely that it\r
+expects the output of --output=files to be in a certain order. So we\r
+add the fix for that into the same commit.\r
+\r
+This mainly involves sorting, although the case --duplicate=$n\r
+requires more subtlety.\r
+---\r
+\r
+curses, I forget -M on this the first time which made it 200k\r
+\r
+ test/T090-search-output.sh | 230 +++++++++++++++++----------------\r
+ test/corpus/{cur => }/01:2, | 0\r
+ test/corpus/{cur => }/02:2, | 0\r
+ test/corpus/{cur => bar}/17:2, | 0\r
+ test/corpus/{cur => bar}/18:2, | 0\r
+ test/corpus/{cur => bar/baz}/05:2, | 0\r
+ test/corpus/{cur => bar/baz}/23:2, | 0\r
+ test/corpus/{cur => bar/baz}/24:2, | 0\r
+ test/corpus/{ => bar/baz}/cur/25:2, | 0\r
+ test/corpus/{ => bar/baz}/cur/26:2, | 0\r
+ test/corpus/{cur => bar/baz/new}/27:2, | 0\r
+ test/corpus/{cur => bar/baz/new}/28:2, | 0\r
+ test/corpus/{ => bar}/cur/19:2, | 0\r
+ test/corpus/{ => bar}/cur/20:2, | 0\r
+ test/corpus/{cur => bar/new}/21:2, | 0\r
+ test/corpus/{cur => bar/new}/22:2, | 0\r
+ test/corpus/{cur => foo}/06:2, | 0\r
+ test/corpus/{cur => foo/baz}/11:2, | 0\r
+ test/corpus/{cur => foo/baz}/12:2, | 0\r
+ test/corpus/{ => foo/baz}/cur/13:2, | 0\r
+ test/corpus/{ => foo/baz}/cur/14:2, | 0\r
+ test/corpus/{cur => foo/baz/new}/15:2, | 0\r
+ test/corpus/{cur => foo/baz/new}/16:2, | 0\r
+ test/corpus/{ => foo}/cur/07:2, | 0\r
+ test/corpus/{ => foo}/cur/08:2, | 0\r
+ test/corpus/{cur => foo/new}/03:2, | 0\r
+ test/corpus/{cur => foo/new}/09:2, | 0\r
+ test/corpus/{cur => foo/new}/10:2, | 0\r
+ test/corpus/{cur => new}/04:2, | 0\r
+ 29 files changed, 117 insertions(+), 113 deletions(-)\r
+ rename test/corpus/{cur => }/01:2, (100%)\r
+ rename test/corpus/{cur => }/02:2, (100%)\r
+ rename test/corpus/{cur => bar}/17:2, (100%)\r
+ rename test/corpus/{cur => bar}/18:2, (100%)\r
+ rename test/corpus/{cur => bar/baz}/05:2, (100%)\r
+ rename test/corpus/{cur => bar/baz}/23:2, (100%)\r
+ rename test/corpus/{cur => bar/baz}/24:2, (100%)\r
+ rename test/corpus/{ => bar/baz}/cur/25:2, (100%)\r
+ rename test/corpus/{ => bar/baz}/cur/26:2, (100%)\r
+ rename test/corpus/{cur => bar/baz/new}/27:2, (100%)\r
+ rename test/corpus/{cur => bar/baz/new}/28:2, (100%)\r
+ rename test/corpus/{ => bar}/cur/19:2, (100%)\r
+ rename test/corpus/{ => bar}/cur/20:2, (100%)\r
+ rename test/corpus/{cur => bar/new}/21:2, (100%)\r
+ rename test/corpus/{cur => bar/new}/22:2, (100%)\r
+ rename test/corpus/{cur => foo}/06:2, (100%)\r
+ rename test/corpus/{cur => foo/baz}/11:2, (100%)\r
+ rename test/corpus/{cur => foo/baz}/12:2, (100%)\r
+ rename test/corpus/{ => foo/baz}/cur/13:2, (100%)\r
+ rename test/corpus/{ => foo/baz}/cur/14:2, (100%)\r
+ rename test/corpus/{cur => foo/baz/new}/15:2, (100%)\r
+ rename test/corpus/{cur => foo/baz/new}/16:2, (100%)\r
+ rename test/corpus/{ => foo}/cur/07:2, (100%)\r
+ rename test/corpus/{ => foo}/cur/08:2, (100%)\r
+ rename test/corpus/{cur => foo/new}/03:2, (100%)\r
+ rename test/corpus/{cur => foo/new}/09:2, (100%)\r
+ rename test/corpus/{cur => foo/new}/10:2, (100%)\r
+ rename test/corpus/{cur => new}/04:2, (100%)\r
+\r
+diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh\r
+index a8ab920..947d572 100755\r
+--- a/test/T090-search-output.sh\r
++++ b/test/T090-search-output.sh\r
+@@ -181,67 +181,71 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "--output=files"\r
+-notmuch search --output=files '*' | notmuch_search_files_sanitize >OUTPUT\r
++notmuch search --output=files '*' | notmuch_search_files_sanitize | sort >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+-MAIL_DIR/cur/52:2,\r
+-MAIL_DIR/cur/53:2,\r
+-MAIL_DIR/cur/50:2,\r
+-MAIL_DIR/cur/49:2,\r
+-MAIL_DIR/cur/48:2,\r
+-MAIL_DIR/cur/47:2,\r
+-MAIL_DIR/cur/46:2,\r
+-MAIL_DIR/cur/45:2,\r
+-MAIL_DIR/cur/44:2,\r
+-MAIL_DIR/cur/43:2,\r
+-MAIL_DIR/cur/42:2,\r
+-MAIL_DIR/cur/41:2,\r
+-MAIL_DIR/cur/40:2,\r
+-MAIL_DIR/cur/39:2,\r
+-MAIL_DIR/cur/38:2,\r
+-MAIL_DIR/cur/37:2,\r
+-MAIL_DIR/cur/36:2,\r
+-MAIL_DIR/cur/35:2,\r
+-MAIL_DIR/cur/34:2,\r
+-MAIL_DIR/cur/33:2,\r
+-MAIL_DIR/cur/32:2,\r
+-MAIL_DIR/cur/31:2,\r
+-MAIL_DIR/cur/30:2,\r
++MAIL_DIR/01:2,\r
++MAIL_DIR/02:2,\r
++MAIL_DIR/bar/17:2,\r
++MAIL_DIR/bar/18:2,\r
++MAIL_DIR/bar/baz/05:2,\r
++MAIL_DIR/bar/baz/23:2,\r
++MAIL_DIR/bar/baz/24:2,\r
++MAIL_DIR/bar/baz/cur/25:2,\r
++MAIL_DIR/bar/baz/cur/26:2,\r
++MAIL_DIR/bar/baz/new/27:2,\r
++MAIL_DIR/bar/baz/new/28:2,\r
++MAIL_DIR/bar/cur/19:2,\r
++MAIL_DIR/bar/cur/20:2,\r
++MAIL_DIR/bar/new/21:2,\r
++MAIL_DIR/bar/new/22:2,\r
+ MAIL_DIR/cur/29:2,\r
+-MAIL_DIR/cur/28:2,\r
+-MAIL_DIR/cur/27:2,\r
+-MAIL_DIR/cur/26:2,\r
+-MAIL_DIR/cur/25:2,\r
+-MAIL_DIR/cur/24:2,\r
+-MAIL_DIR/cur/23:2,\r
+-MAIL_DIR/cur/22:2,\r
+-MAIL_DIR/cur/21:2,\r
+-MAIL_DIR/cur/19:2,\r
+-MAIL_DIR/cur/18:2,\r
++MAIL_DIR/cur/30:2,\r
++MAIL_DIR/cur/31:2,\r
++MAIL_DIR/cur/32:2,\r
++MAIL_DIR/cur/33:2,\r
++MAIL_DIR/cur/34:2,\r
++MAIL_DIR/cur/35:2,\r
++MAIL_DIR/cur/36:2,\r
++MAIL_DIR/cur/37:2,\r
++MAIL_DIR/cur/38:2,\r
++MAIL_DIR/cur/39:2,\r
++MAIL_DIR/cur/40:2,\r
++MAIL_DIR/cur/41:2,\r
++MAIL_DIR/cur/42:2,\r
++MAIL_DIR/cur/43:2,\r
++MAIL_DIR/cur/44:2,\r
++MAIL_DIR/cur/45:2,\r
++MAIL_DIR/cur/46:2,\r
++MAIL_DIR/cur/47:2,\r
++MAIL_DIR/cur/48:2,\r
++MAIL_DIR/cur/49:2,\r
++MAIL_DIR/cur/50:2,\r
+ MAIL_DIR/cur/51:2,\r
+-MAIL_DIR/cur/20:2,\r
+-MAIL_DIR/cur/17:2,\r
+-MAIL_DIR/cur/16:2,\r
+-MAIL_DIR/cur/15:2,\r
+-MAIL_DIR/cur/14:2,\r
+-MAIL_DIR/cur/13:2,\r
+-MAIL_DIR/cur/12:2,\r
+-MAIL_DIR/cur/11:2,\r
+-MAIL_DIR/cur/10:2,\r
+-MAIL_DIR/cur/09:2,\r
+-MAIL_DIR/cur/08:2,\r
+-MAIL_DIR/cur/06:2,\r
+-MAIL_DIR/cur/05:2,\r
+-MAIL_DIR/cur/04:2,\r
+-MAIL_DIR/cur/03:2,\r
+-MAIL_DIR/cur/07:2,\r
+-MAIL_DIR/cur/02:2,\r
+-MAIL_DIR/cur/01:2,\r
++MAIL_DIR/cur/52:2,\r
++MAIL_DIR/cur/53:2,\r
++MAIL_DIR/foo/06:2,\r
++MAIL_DIR/foo/baz/11:2,\r
++MAIL_DIR/foo/baz/12:2,\r
++MAIL_DIR/foo/baz/cur/13:2,\r
++MAIL_DIR/foo/baz/cur/14:2,\r
++MAIL_DIR/foo/baz/new/15:2,\r
++MAIL_DIR/foo/baz/new/16:2,\r
++MAIL_DIR/foo/cur/07:2,\r
++MAIL_DIR/foo/cur/08:2,\r
++MAIL_DIR/foo/new/03:2,\r
++MAIL_DIR/foo/new/09:2,\r
++MAIL_DIR/foo/new/10:2,\r
++MAIL_DIR/new/04:2,\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
++dup1=$(notmuch search --output=files id:20091117232137.GA7669@griffis1.net | head -n 1 | sed -e "s,$MAIL_DIR,MAIL_DIR,")\r
++dup2=$(notmuch search --output=files id:20091117232137.GA7669@griffis1.net | tail -n 1 | sed -e "s,$MAIL_DIR,MAIL_DIR,")\r
++\r
+ test_begin_subtest "--output=files --duplicate=1"\r
+-notmuch search --output=files --duplicate=1 '*' | notmuch_search_files_sanitize >OUTPUT\r
+-cat <<EOF >EXPECTED\r
++notmuch search --output=files --duplicate=1 '*' | notmuch_search_files_sanitize | sort >OUTPUT\r
++cat <<EOF | sort >EXPECTED\r
++$dup1\r
+ MAIL_DIR/cur/52:2,\r
+ MAIL_DIR/cur/53:2,\r
+ MAIL_DIR/cur/50:2,\r
+@@ -266,40 +270,40 @@ MAIL_DIR/cur/32:2,\r
+ MAIL_DIR/cur/31:2,\r
+ MAIL_DIR/cur/30:2,\r
+ MAIL_DIR/cur/29:2,\r
+-MAIL_DIR/cur/28:2,\r
+-MAIL_DIR/cur/27:2,\r
+-MAIL_DIR/cur/26:2,\r
+-MAIL_DIR/cur/25:2,\r
+-MAIL_DIR/cur/24:2,\r
+-MAIL_DIR/cur/23:2,\r
+-MAIL_DIR/cur/22:2,\r
+-MAIL_DIR/cur/21:2,\r
+-MAIL_DIR/cur/19:2,\r
+-MAIL_DIR/cur/18:2,\r
+-MAIL_DIR/cur/20:2,\r
+-MAIL_DIR/cur/17:2,\r
+-MAIL_DIR/cur/16:2,\r
+-MAIL_DIR/cur/15:2,\r
+-MAIL_DIR/cur/14:2,\r
+-MAIL_DIR/cur/13:2,\r
+-MAIL_DIR/cur/12:2,\r
+-MAIL_DIR/cur/11:2,\r
+-MAIL_DIR/cur/10:2,\r
+-MAIL_DIR/cur/09:2,\r
+-MAIL_DIR/cur/08:2,\r
+-MAIL_DIR/cur/06:2,\r
+-MAIL_DIR/cur/05:2,\r
+-MAIL_DIR/cur/04:2,\r
+-MAIL_DIR/cur/03:2,\r
+-MAIL_DIR/cur/07:2,\r
+-MAIL_DIR/cur/02:2,\r
+-MAIL_DIR/cur/01:2,\r
++MAIL_DIR/bar/baz/new/28:2,\r
++MAIL_DIR/bar/baz/new/27:2,\r
++MAIL_DIR/bar/baz/cur/26:2,\r
++MAIL_DIR/bar/baz/cur/25:2,\r
++MAIL_DIR/bar/baz/24:2,\r
++MAIL_DIR/bar/baz/23:2,\r
++MAIL_DIR/bar/new/22:2,\r
++MAIL_DIR/bar/new/21:2,\r
++MAIL_DIR/bar/cur/19:2,\r
++MAIL_DIR/bar/cur/20:2,\r
++MAIL_DIR/bar/17:2,\r
++MAIL_DIR/foo/baz/new/16:2,\r
++MAIL_DIR/foo/baz/new/15:2,\r
++MAIL_DIR/foo/baz/cur/14:2,\r
++MAIL_DIR/foo/baz/cur/13:2,\r
++MAIL_DIR/foo/baz/12:2,\r
++MAIL_DIR/foo/baz/11:2,\r
++MAIL_DIR/foo/new/10:2,\r
++MAIL_DIR/foo/new/09:2,\r
++MAIL_DIR/foo/cur/08:2,\r
++MAIL_DIR/foo/06:2,\r
++MAIL_DIR/bar/baz/05:2,\r
++MAIL_DIR/new/04:2,\r
++MAIL_DIR/foo/new/03:2,\r
++MAIL_DIR/foo/cur/07:2,\r
++MAIL_DIR/02:2,\r
++MAIL_DIR/01:2,\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "--output=files --format=json"\r
+-notmuch search --format=json --output=files '*' | notmuch_search_files_sanitize >OUTPUT\r
+-cat <<EOF >EXPECTED\r
++notmuch search --format=json --output=files '*' | notmuch_search_files_sanitize \\r
++ | test_sort_json >OUTPUT\r
++cat <<EOF | test_sort_json >EXPECTED\r
+ ["MAIL_DIR/cur/52:2,",\r
+ "MAIL_DIR/cur/53:2,",\r
+ "MAIL_DIR/cur/50:2,",\r
+@@ -324,42 +328,42 @@ cat <<EOF >EXPECTED\r
+ "MAIL_DIR/cur/31:2,",\r
+ "MAIL_DIR/cur/30:2,",\r
+ "MAIL_DIR/cur/29:2,",\r
+-"MAIL_DIR/cur/28:2,",\r
+-"MAIL_DIR/cur/27:2,",\r
+-"MAIL_DIR/cur/26:2,",\r
+-"MAIL_DIR/cur/25:2,",\r
+-"MAIL_DIR/cur/24:2,",\r
+-"MAIL_DIR/cur/23:2,",\r
+-"MAIL_DIR/cur/22:2,",\r
+-"MAIL_DIR/cur/21:2,",\r
+-"MAIL_DIR/cur/19:2,",\r
+-"MAIL_DIR/cur/18:2,",\r
++"MAIL_DIR/bar/baz/new/28:2,",\r
++"MAIL_DIR/bar/baz/new/27:2,",\r
++"MAIL_DIR/bar/baz/cur/26:2,",\r
++"MAIL_DIR/bar/baz/cur/25:2,",\r
++"MAIL_DIR/bar/baz/24:2,",\r
++"MAIL_DIR/bar/baz/23:2,",\r
++"MAIL_DIR/bar/new/22:2,",\r
++"MAIL_DIR/bar/new/21:2,",\r
++"MAIL_DIR/bar/cur/19:2,",\r
++"MAIL_DIR/bar/18:2,",\r
+ "MAIL_DIR/cur/51:2,",\r
+-"MAIL_DIR/cur/20:2,",\r
+-"MAIL_DIR/cur/17:2,",\r
+-"MAIL_DIR/cur/16:2,",\r
+-"MAIL_DIR/cur/15:2,",\r
+-"MAIL_DIR/cur/14:2,",\r
+-"MAIL_DIR/cur/13:2,",\r
+-"MAIL_DIR/cur/12:2,",\r
+-"MAIL_DIR/cur/11:2,",\r
+-"MAIL_DIR/cur/10:2,",\r
+-"MAIL_DIR/cur/09:2,",\r
+-"MAIL_DIR/cur/08:2,",\r
+-"MAIL_DIR/cur/06:2,",\r
+-"MAIL_DIR/cur/05:2,",\r
+-"MAIL_DIR/cur/04:2,",\r
+-"MAIL_DIR/cur/03:2,",\r
+-"MAIL_DIR/cur/07:2,",\r
+-"MAIL_DIR/cur/02:2,",\r
+-"MAIL_DIR/cur/01:2,"]\r
++"MAIL_DIR/bar/cur/20:2,",\r
++"MAIL_DIR/bar/17:2,",\r
++"MAIL_DIR/foo/baz/new/16:2,",\r
++"MAIL_DIR/foo/baz/new/15:2,",\r
++"MAIL_DIR/foo/baz/cur/14:2,",\r
++"MAIL_DIR/foo/baz/cur/13:2,",\r
++"MAIL_DIR/foo/baz/12:2,",\r
++"MAIL_DIR/foo/baz/11:2,",\r
++"MAIL_DIR/foo/new/10:2,",\r
++"MAIL_DIR/foo/new/09:2,",\r
++"MAIL_DIR/foo/cur/08:2,",\r
++"MAIL_DIR/foo/06:2,",\r
++"MAIL_DIR/bar/baz/05:2,",\r
++"MAIL_DIR/new/04:2,",\r
++"MAIL_DIR/foo/new/03:2,",\r
++"MAIL_DIR/foo/cur/07:2,",\r
++"MAIL_DIR/02:2,",\r
++"MAIL_DIR/01:2,"]\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "--output=files --format=json --duplicate=2"\r
+ notmuch search --format=json --output=files --duplicate=2 '*' | notmuch_search_files_sanitize >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+-["MAIL_DIR/cur/51:2,"]\r
++["$dup2"]\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+diff --git a/test/corpus/cur/01:2, b/test/corpus/01:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/01:2,\r
+rename to test/corpus/01:2,\r
+diff --git a/test/corpus/cur/02:2, b/test/corpus/02:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/02:2,\r
+rename to test/corpus/02:2,\r
+diff --git a/test/corpus/cur/17:2, b/test/corpus/bar/17:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/17:2,\r
+rename to test/corpus/bar/17:2,\r
+diff --git a/test/corpus/cur/18:2, b/test/corpus/bar/18:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/18:2,\r
+rename to test/corpus/bar/18:2,\r
+diff --git a/test/corpus/cur/05:2, b/test/corpus/bar/baz/05:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/05:2,\r
+rename to test/corpus/bar/baz/05:2,\r
+diff --git a/test/corpus/cur/23:2, b/test/corpus/bar/baz/23:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/23:2,\r
+rename to test/corpus/bar/baz/23:2,\r
+diff --git a/test/corpus/cur/24:2, b/test/corpus/bar/baz/24:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/24:2,\r
+rename to test/corpus/bar/baz/24:2,\r
+diff --git a/test/corpus/cur/25:2, b/test/corpus/bar/baz/cur/25:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/25:2,\r
+rename to test/corpus/bar/baz/cur/25:2,\r
+diff --git a/test/corpus/cur/26:2, b/test/corpus/bar/baz/cur/26:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/26:2,\r
+rename to test/corpus/bar/baz/cur/26:2,\r
+diff --git a/test/corpus/cur/27:2, b/test/corpus/bar/baz/new/27:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/27:2,\r
+rename to test/corpus/bar/baz/new/27:2,\r
+diff --git a/test/corpus/cur/28:2, b/test/corpus/bar/baz/new/28:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/28:2,\r
+rename to test/corpus/bar/baz/new/28:2,\r
+diff --git a/test/corpus/cur/19:2, b/test/corpus/bar/cur/19:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/19:2,\r
+rename to test/corpus/bar/cur/19:2,\r
+diff --git a/test/corpus/cur/20:2, b/test/corpus/bar/cur/20:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/20:2,\r
+rename to test/corpus/bar/cur/20:2,\r
+diff --git a/test/corpus/cur/21:2, b/test/corpus/bar/new/21:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/21:2,\r
+rename to test/corpus/bar/new/21:2,\r
+diff --git a/test/corpus/cur/22:2, b/test/corpus/bar/new/22:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/22:2,\r
+rename to test/corpus/bar/new/22:2,\r
+diff --git a/test/corpus/cur/06:2, b/test/corpus/foo/06:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/06:2,\r
+rename to test/corpus/foo/06:2,\r
+diff --git a/test/corpus/cur/11:2, b/test/corpus/foo/baz/11:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/11:2,\r
+rename to test/corpus/foo/baz/11:2,\r
+diff --git a/test/corpus/cur/12:2, b/test/corpus/foo/baz/12:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/12:2,\r
+rename to test/corpus/foo/baz/12:2,\r
+diff --git a/test/corpus/cur/13:2, b/test/corpus/foo/baz/cur/13:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/13:2,\r
+rename to test/corpus/foo/baz/cur/13:2,\r
+diff --git a/test/corpus/cur/14:2, b/test/corpus/foo/baz/cur/14:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/14:2,\r
+rename to test/corpus/foo/baz/cur/14:2,\r
+diff --git a/test/corpus/cur/15:2, b/test/corpus/foo/baz/new/15:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/15:2,\r
+rename to test/corpus/foo/baz/new/15:2,\r
+diff --git a/test/corpus/cur/16:2, b/test/corpus/foo/baz/new/16:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/16:2,\r
+rename to test/corpus/foo/baz/new/16:2,\r
+diff --git a/test/corpus/cur/07:2, b/test/corpus/foo/cur/07:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/07:2,\r
+rename to test/corpus/foo/cur/07:2,\r
+diff --git a/test/corpus/cur/08:2, b/test/corpus/foo/cur/08:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/08:2,\r
+rename to test/corpus/foo/cur/08:2,\r
+diff --git a/test/corpus/cur/03:2, b/test/corpus/foo/new/03:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/03:2,\r
+rename to test/corpus/foo/new/03:2,\r
+diff --git a/test/corpus/cur/09:2, b/test/corpus/foo/new/09:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/09:2,\r
+rename to test/corpus/foo/new/09:2,\r
+diff --git a/test/corpus/cur/10:2, b/test/corpus/foo/new/10:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/10:2,\r
+rename to test/corpus/foo/new/10:2,\r
+diff --git a/test/corpus/cur/04:2, b/test/corpus/new/04:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/04:2,\r
+rename to test/corpus/new/04:2,\r
+-- \r
+1.8.5.3\r
+\r
projects / notmuch-archives.git / commitdiff