2e/d572dede3dcdd1f0baa3ce2ef3def0f484413d

   1 Return-Path: <jani@nikula.org>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 37545431FC2\r
   6         for <notmuch@notmuchmail.org>; Sun,  9 Mar 2014 14:40:47 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
   9 X-Spam-Flag: NO\r
  10 X-Spam-Score: -0.7\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  13         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id 2AtOgwLJlP+G for <notmuch@notmuchmail.org>;\r
  17         Sun,  9 Mar 2014 14:40:42 -0700 (PDT)\r
  18 Received: from mail-la0-f42.google.com (mail-la0-f42.google.com\r
  19         [209.85.215.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 9E47B431FBD\r
  22         for <notmuch@notmuchmail.org>; Sun,  9 Mar 2014 14:40:41 -0700 (PDT)\r
  23 Received: by mail-la0-f42.google.com with SMTP id ec20so4201553lab.1\r
  24         for <notmuch@notmuchmail.org>; Sun, 09 Mar 2014 14:40:40 -0700 (PDT)\r
  25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  26         d=1e100.net; s=20130820;\r
  27         h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
  28         :references:in-reply-to:references;\r
  29         bh=ta2ffAs5HnGDoQ0uqyqxjsj2mGmNBDbUUGjaWvsNuws=;\r
  30         b=PEz34W2PYu52oxVUDwr87abpcn9oiSS5xoop18eBB3RjuSg1zJhq0gaCGA0mJcYOQn\r
  31         ZE5b1NNXmxBxXnw4vxAIIe7Ynvw3agyFNZbk3Qu/KIN4c5qKr5IkwOCOADRgSseFxUMh\r
  32         Zv+A7TlispUD8LgWvgDOoNOeU50VqeamIocK4yKRdHJ8a/459WD88vfEBSs/m5OnX0o9\r
  33         KOkCqEkKP92kz6SqKi4m2uzHqTcaFrqoerwBhO4EKCfGUvgZtOstI8cfuoWMfythYj0u\r
  34         aqNXzBVgbZ3T0oJnmhWNy27ylkcdZ3ayh9GH2+Khm6oMve2vkhL+zVhSX/Y5xt+EU6gM\r
  35         VWfQ==\r
  36 X-Gm-Message-State:\r
  37  ALoCoQkiLq3Fi2k3Z1T5Oii/VvwGuhgXaCGM/tIQ6zNcnHtp+LswOyOVlwa+J2DcF/eOYrnbJsOC\r
  38 X-Received: by 10.152.6.199 with SMTP id d7mr21271797laa.22.1394401240144;\r
  39         Sun, 09 Mar 2014 14:40:40 -0700 (PDT)\r
  40 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  41         [88.195.111.91])\r
  42         by mx.google.com with ESMTPSA id q4sm19397147lbl.14.2014.03.09.14.40.38\r
  43         for <multiple recipients>\r
  44         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  45         Sun, 09 Mar 2014 14:40:39 -0700 (PDT)\r
  46 From: Jani Nikula <jani@nikula.org>\r
  47 To: notmuch@notmuchmail.org\r
  48 Subject: [PATCH v4 01/13] test: rearrange the test corpus into subfolders\r
  49 Date: Sun,  9 Mar 2014 23:40:22 +0200\r
  50 Message-Id:\r
  51  <aa121361c0ad354f2c6d45b776299a0ba59b6844.1394400503.git.jani@nikula.org>\r
  52 X-Mailer: git-send-email 1.9.0\r
  53 In-Reply-To: <cover.1394400503.git.jani@nikula.org>\r
  54 References: <cover.1394400503.git.jani@nikula.org>\r
  55 In-Reply-To: <cover.1394400503.git.jani@nikula.org>\r
  56 References: <cover.1394400503.git.jani@nikula.org>\r
  57 X-BeenThere: notmuch@notmuchmail.org\r
  58 X-Mailman-Version: 2.1.13\r
  59 Precedence: list\r
  60 List-Id: "Use and development of the notmuch mail system."\r
  61         <notmuch.notmuchmail.org>\r
  62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  65 List-Post: <mailto:notmuch@notmuchmail.org>\r
  66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  69 X-List-Received-Date: Sun, 09 Mar 2014 21:40:47 -0000\r
  70 \r
  71 We will need this for improved folder search tests, but having some\r
  72 folders should exercise our code paths better anyway.\r
  73 \r
  74 Modify the relevant test accordingly to make it pass.\r
  75 ---\r
  76  test/T090-search-output.sh             | 168 ++++++++++++++++-----------------\r
  77  test/corpus/{cur => }/01:2,            |   0\r
  78  test/corpus/{cur => }/02:2,            |   0\r
  79  test/corpus/{cur => bar}/17:2,         |   0\r
  80  test/corpus/{cur => bar}/18:2,         |   0\r
  81  test/corpus/{cur => bar/baz}/05:2,     |   0\r
  82  test/corpus/{cur => bar/baz}/23:2,     |   0\r
  83  test/corpus/{cur => bar/baz}/24:2,     |   0\r
  84  test/corpus/{ => bar/baz}/cur/25:2,    |   0\r
  85  test/corpus/{ => bar/baz}/cur/26:2,    |   0\r
  86  test/corpus/{cur => bar/baz/new}/27:2, |   0\r
  87  test/corpus/{cur => bar/baz/new}/28:2, |   0\r
  88  test/corpus/{ => bar}/cur/19:2,        |   0\r
  89  test/corpus/{ => bar}/cur/20:2,        |   0\r
  90  test/corpus/{cur => bar/new}/21:2,     |   0\r
  91  test/corpus/{cur => bar/new}/22:2,     |   0\r
  92  test/corpus/{cur => foo}/06:2,         |   0\r
  93  test/corpus/{cur => foo/baz}/11:2,     |   0\r
  94  test/corpus/{cur => foo/baz}/12:2,     |   0\r
  95  test/corpus/{ => foo/baz}/cur/13:2,    |   0\r
  96  test/corpus/{ => foo/baz}/cur/14:2,    |   0\r
  97  test/corpus/{cur => foo/baz/new}/15:2, |   0\r
  98  test/corpus/{cur => foo/baz/new}/16:2, |   0\r
  99  test/corpus/{ => foo}/cur/07:2,        |   0\r
 100  test/corpus/{ => foo}/cur/08:2,        |   0\r
 101  test/corpus/{cur => foo/new}/03:2,     |   0\r
 102  test/corpus/{cur => foo/new}/09:2,     |   0\r
 103  test/corpus/{cur => foo/new}/10:2,     |   0\r
 104  test/corpus/{cur => new}/04:2,         |   0\r
 105  29 files changed, 84 insertions(+), 84 deletions(-)\r
 106  rename test/corpus/{cur => }/01:2, (100%)\r
 107  rename test/corpus/{cur => }/02:2, (100%)\r
 108  rename test/corpus/{cur => bar}/17:2, (100%)\r
 109  rename test/corpus/{cur => bar}/18:2, (100%)\r
 110  rename test/corpus/{cur => bar/baz}/05:2, (100%)\r
 111  rename test/corpus/{cur => bar/baz}/23:2, (100%)\r
 112  rename test/corpus/{cur => bar/baz}/24:2, (100%)\r
 113  rename test/corpus/{ => bar/baz}/cur/25:2, (100%)\r
 114  rename test/corpus/{ => bar/baz}/cur/26:2, (100%)\r
 115  rename test/corpus/{cur => bar/baz/new}/27:2, (100%)\r
 116  rename test/corpus/{cur => bar/baz/new}/28:2, (100%)\r
 117  rename test/corpus/{ => bar}/cur/19:2, (100%)\r
 118  rename test/corpus/{ => bar}/cur/20:2, (100%)\r
 119  rename test/corpus/{cur => bar/new}/21:2, (100%)\r
 120  rename test/corpus/{cur => bar/new}/22:2, (100%)\r
 121  rename test/corpus/{cur => foo}/06:2, (100%)\r
 122  rename test/corpus/{cur => foo/baz}/11:2, (100%)\r
 123  rename test/corpus/{cur => foo/baz}/12:2, (100%)\r
 124  rename test/corpus/{ => foo/baz}/cur/13:2, (100%)\r
 125  rename test/corpus/{ => foo/baz}/cur/14:2, (100%)\r
 126  rename test/corpus/{cur => foo/baz/new}/15:2, (100%)\r
 127  rename test/corpus/{cur => foo/baz/new}/16:2, (100%)\r
 128  rename test/corpus/{ => foo}/cur/07:2, (100%)\r
 129  rename test/corpus/{ => foo}/cur/08:2, (100%)\r
 130  rename test/corpus/{cur => foo/new}/03:2, (100%)\r
 131  rename test/corpus/{cur => foo/new}/09:2, (100%)\r
 132  rename test/corpus/{cur => foo/new}/10:2, (100%)\r
 133  rename test/corpus/{cur => new}/04:2, (100%)\r
 134 \r
 135 diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh\r
 136 index 86544ac956a1..ef28c3d157aa 100755\r
 137 --- a/test/T090-search-output.sh\r
 138 +++ b/test/T090-search-output.sh\r
 139 @@ -207,35 +207,35 @@ MAIL_DIR/cur/32:2,\r
 140  MAIL_DIR/cur/31:2,\r
 141  MAIL_DIR/cur/30:2,\r
 142  MAIL_DIR/cur/29:2,\r
 143 -MAIL_DIR/cur/28:2,\r
 144 -MAIL_DIR/cur/27:2,\r
 145 -MAIL_DIR/cur/26:2,\r
 146 -MAIL_DIR/cur/25:2,\r
 147 -MAIL_DIR/cur/24:2,\r
 148 -MAIL_DIR/cur/23:2,\r
 149 -MAIL_DIR/cur/22:2,\r
 150 -MAIL_DIR/cur/21:2,\r
 151 -MAIL_DIR/cur/19:2,\r
 152 -MAIL_DIR/cur/18:2,\r
 153 +MAIL_DIR/bar/baz/new/28:2,\r
 154 +MAIL_DIR/bar/baz/new/27:2,\r
 155 +MAIL_DIR/bar/baz/cur/26:2,\r
 156 +MAIL_DIR/bar/baz/cur/25:2,\r
 157 +MAIL_DIR/bar/baz/24:2,\r
 158 +MAIL_DIR/bar/baz/23:2,\r
 159 +MAIL_DIR/bar/new/22:2,\r
 160 +MAIL_DIR/bar/new/21:2,\r
 161 +MAIL_DIR/bar/cur/19:2,\r
 162 +MAIL_DIR/bar/18:2,\r
 163  MAIL_DIR/cur/51:2,\r
 164 -MAIL_DIR/cur/20:2,\r
 165 -MAIL_DIR/cur/17:2,\r
 166 -MAIL_DIR/cur/16:2,\r
 167 -MAIL_DIR/cur/15:2,\r
 168 -MAIL_DIR/cur/14:2,\r
 169 -MAIL_DIR/cur/13:2,\r
 170 -MAIL_DIR/cur/12:2,\r
 171 -MAIL_DIR/cur/11:2,\r
 172 -MAIL_DIR/cur/10:2,\r
 173 -MAIL_DIR/cur/09:2,\r
 174 -MAIL_DIR/cur/08:2,\r
 175 -MAIL_DIR/cur/06:2,\r
 176 -MAIL_DIR/cur/05:2,\r
 177 -MAIL_DIR/cur/04:2,\r
 178 -MAIL_DIR/cur/03:2,\r
 179 -MAIL_DIR/cur/07:2,\r
 180 -MAIL_DIR/cur/02:2,\r
 181 -MAIL_DIR/cur/01:2,\r
 182 +MAIL_DIR/bar/cur/20:2,\r
 183 +MAIL_DIR/bar/17:2,\r
 184 +MAIL_DIR/foo/baz/new/16:2,\r
 185 +MAIL_DIR/foo/baz/new/15:2,\r
 186 +MAIL_DIR/foo/baz/cur/14:2,\r
 187 +MAIL_DIR/foo/baz/cur/13:2,\r
 188 +MAIL_DIR/foo/baz/12:2,\r
 189 +MAIL_DIR/foo/baz/11:2,\r
 190 +MAIL_DIR/foo/new/10:2,\r
 191 +MAIL_DIR/foo/new/09:2,\r
 192 +MAIL_DIR/foo/cur/08:2,\r
 193 +MAIL_DIR/foo/06:2,\r
 194 +MAIL_DIR/bar/baz/05:2,\r
 195 +MAIL_DIR/new/04:2,\r
 196 +MAIL_DIR/foo/new/03:2,\r
 197 +MAIL_DIR/foo/cur/07:2,\r
 198 +MAIL_DIR/02:2,\r
 199 +MAIL_DIR/01:2,\r
 200  EOF\r
 201  test_expect_equal_file OUTPUT EXPECTED\r
 202  \r
 203 @@ -266,34 +266,34 @@ MAIL_DIR/cur/32:2,\r
 204  MAIL_DIR/cur/31:2,\r
 205  MAIL_DIR/cur/30:2,\r
 206  MAIL_DIR/cur/29:2,\r
 207 -MAIL_DIR/cur/28:2,\r
 208 -MAIL_DIR/cur/27:2,\r
 209 -MAIL_DIR/cur/26:2,\r
 210 -MAIL_DIR/cur/25:2,\r
 211 -MAIL_DIR/cur/24:2,\r
 212 -MAIL_DIR/cur/23:2,\r
 213 -MAIL_DIR/cur/22:2,\r
 214 -MAIL_DIR/cur/21:2,\r
 215 -MAIL_DIR/cur/19:2,\r
 216 -MAIL_DIR/cur/18:2,\r
 217 -MAIL_DIR/cur/20:2,\r
 218 -MAIL_DIR/cur/17:2,\r
 219 -MAIL_DIR/cur/16:2,\r
 220 -MAIL_DIR/cur/15:2,\r
 221 -MAIL_DIR/cur/14:2,\r
 222 -MAIL_DIR/cur/13:2,\r
 223 -MAIL_DIR/cur/12:2,\r
 224 -MAIL_DIR/cur/11:2,\r
 225 -MAIL_DIR/cur/10:2,\r
 226 -MAIL_DIR/cur/09:2,\r
 227 -MAIL_DIR/cur/08:2,\r
 228 -MAIL_DIR/cur/06:2,\r
 229 -MAIL_DIR/cur/05:2,\r
 230 -MAIL_DIR/cur/04:2,\r
 231 -MAIL_DIR/cur/03:2,\r
 232 -MAIL_DIR/cur/07:2,\r
 233 -MAIL_DIR/cur/02:2,\r
 234 -MAIL_DIR/cur/01:2,\r
 235 +MAIL_DIR/bar/baz/new/28:2,\r
 236 +MAIL_DIR/bar/baz/new/27:2,\r
 237 +MAIL_DIR/bar/baz/cur/26:2,\r
 238 +MAIL_DIR/bar/baz/cur/25:2,\r
 239 +MAIL_DIR/bar/baz/24:2,\r
 240 +MAIL_DIR/bar/baz/23:2,\r
 241 +MAIL_DIR/bar/new/22:2,\r
 242 +MAIL_DIR/bar/new/21:2,\r
 243 +MAIL_DIR/bar/cur/19:2,\r
 244 +MAIL_DIR/bar/18:2,\r
 245 +MAIL_DIR/bar/cur/20:2,\r
 246 +MAIL_DIR/bar/17:2,\r
 247 +MAIL_DIR/foo/baz/new/16:2,\r
 248 +MAIL_DIR/foo/baz/new/15:2,\r
 249 +MAIL_DIR/foo/baz/cur/14:2,\r
 250 +MAIL_DIR/foo/baz/cur/13:2,\r
 251 +MAIL_DIR/foo/baz/12:2,\r
 252 +MAIL_DIR/foo/baz/11:2,\r
 253 +MAIL_DIR/foo/new/10:2,\r
 254 +MAIL_DIR/foo/new/09:2,\r
 255 +MAIL_DIR/foo/cur/08:2,\r
 256 +MAIL_DIR/foo/06:2,\r
 257 +MAIL_DIR/bar/baz/05:2,\r
 258 +MAIL_DIR/new/04:2,\r
 259 +MAIL_DIR/foo/new/03:2,\r
 260 +MAIL_DIR/foo/cur/07:2,\r
 261 +MAIL_DIR/02:2,\r
 262 +MAIL_DIR/01:2,\r
 263  EOF\r
 264  test_expect_equal_file OUTPUT EXPECTED\r
 265  \r
 266 @@ -324,35 +324,35 @@ cat <<EOF >EXPECTED\r
 267  "MAIL_DIR/cur/31:2,",\r
 268  "MAIL_DIR/cur/30:2,",\r
 269  "MAIL_DIR/cur/29:2,",\r
 270 -"MAIL_DIR/cur/28:2,",\r
 271 -"MAIL_DIR/cur/27:2,",\r
 272 -"MAIL_DIR/cur/26:2,",\r
 273 -"MAIL_DIR/cur/25:2,",\r
 274 -"MAIL_DIR/cur/24:2,",\r
 275 -"MAIL_DIR/cur/23:2,",\r
 276 -"MAIL_DIR/cur/22:2,",\r
 277 -"MAIL_DIR/cur/21:2,",\r
 278 -"MAIL_DIR/cur/19:2,",\r
 279 -"MAIL_DIR/cur/18:2,",\r
 280 +"MAIL_DIR/bar/baz/new/28:2,",\r
 281 +"MAIL_DIR/bar/baz/new/27:2,",\r
 282 +"MAIL_DIR/bar/baz/cur/26:2,",\r
 283 +"MAIL_DIR/bar/baz/cur/25:2,",\r
 284 +"MAIL_DIR/bar/baz/24:2,",\r
 285 +"MAIL_DIR/bar/baz/23:2,",\r
 286 +"MAIL_DIR/bar/new/22:2,",\r
 287 +"MAIL_DIR/bar/new/21:2,",\r
 288 +"MAIL_DIR/bar/cur/19:2,",\r
 289 +"MAIL_DIR/bar/18:2,",\r
 290  "MAIL_DIR/cur/51:2,",\r
 291 -"MAIL_DIR/cur/20:2,",\r
 292 -"MAIL_DIR/cur/17:2,",\r
 293 -"MAIL_DIR/cur/16:2,",\r
 294 -"MAIL_DIR/cur/15:2,",\r
 295 -"MAIL_DIR/cur/14:2,",\r
 296 -"MAIL_DIR/cur/13:2,",\r
 297 -"MAIL_DIR/cur/12:2,",\r
 298 -"MAIL_DIR/cur/11:2,",\r
 299 -"MAIL_DIR/cur/10:2,",\r
 300 -"MAIL_DIR/cur/09:2,",\r
 301 -"MAIL_DIR/cur/08:2,",\r
 302 -"MAIL_DIR/cur/06:2,",\r
 303 -"MAIL_DIR/cur/05:2,",\r
 304 -"MAIL_DIR/cur/04:2,",\r
 305 -"MAIL_DIR/cur/03:2,",\r
 306 -"MAIL_DIR/cur/07:2,",\r
 307 -"MAIL_DIR/cur/02:2,",\r
 308 -"MAIL_DIR/cur/01:2,"]\r
 309 +"MAIL_DIR/bar/cur/20:2,",\r
 310 +"MAIL_DIR/bar/17:2,",\r
 311 +"MAIL_DIR/foo/baz/new/16:2,",\r
 312 +"MAIL_DIR/foo/baz/new/15:2,",\r
 313 +"MAIL_DIR/foo/baz/cur/14:2,",\r
 314 +"MAIL_DIR/foo/baz/cur/13:2,",\r
 315 +"MAIL_DIR/foo/baz/12:2,",\r
 316 +"MAIL_DIR/foo/baz/11:2,",\r
 317 +"MAIL_DIR/foo/new/10:2,",\r
 318 +"MAIL_DIR/foo/new/09:2,",\r
 319 +"MAIL_DIR/foo/cur/08:2,",\r
 320 +"MAIL_DIR/foo/06:2,",\r
 321 +"MAIL_DIR/bar/baz/05:2,",\r
 322 +"MAIL_DIR/new/04:2,",\r
 323 +"MAIL_DIR/foo/new/03:2,",\r
 324 +"MAIL_DIR/foo/cur/07:2,",\r
 325 +"MAIL_DIR/02:2,",\r
 326 +"MAIL_DIR/01:2,"]\r
 327  EOF\r
 328  test_expect_equal_file OUTPUT EXPECTED\r
 329  \r
 330 diff --git a/test/corpus/cur/01:2, b/test/corpus/01:2,\r
 331 similarity index 100%\r
 332 rename from test/corpus/cur/01:2,\r
 333 rename to test/corpus/01:2,\r
 334 diff --git a/test/corpus/cur/02:2, b/test/corpus/02:2,\r
 335 similarity index 100%\r
 336 rename from test/corpus/cur/02:2,\r
 337 rename to test/corpus/02:2,\r
 338 diff --git a/test/corpus/cur/17:2, b/test/corpus/bar/17:2,\r
 339 similarity index 100%\r
 340 rename from test/corpus/cur/17:2,\r
 341 rename to test/corpus/bar/17:2,\r
 342 diff --git a/test/corpus/cur/18:2, b/test/corpus/bar/18:2,\r
 343 similarity index 100%\r
 344 rename from test/corpus/cur/18:2,\r
 345 rename to test/corpus/bar/18:2,\r
 346 diff --git a/test/corpus/cur/05:2, b/test/corpus/bar/baz/05:2,\r
 347 similarity index 100%\r
 348 rename from test/corpus/cur/05:2,\r
 349 rename to test/corpus/bar/baz/05:2,\r
 350 diff --git a/test/corpus/cur/23:2, b/test/corpus/bar/baz/23:2,\r
 351 similarity index 100%\r
 352 rename from test/corpus/cur/23:2,\r
 353 rename to test/corpus/bar/baz/23:2,\r
 354 diff --git a/test/corpus/cur/24:2, b/test/corpus/bar/baz/24:2,\r
 355 similarity index 100%\r
 356 rename from test/corpus/cur/24:2,\r
 357 rename to test/corpus/bar/baz/24:2,\r
 358 diff --git a/test/corpus/cur/25:2, b/test/corpus/bar/baz/cur/25:2,\r
 359 similarity index 100%\r
 360 rename from test/corpus/cur/25:2,\r
 361 rename to test/corpus/bar/baz/cur/25:2,\r
 362 diff --git a/test/corpus/cur/26:2, b/test/corpus/bar/baz/cur/26:2,\r
 363 similarity index 100%\r
 364 rename from test/corpus/cur/26:2,\r
 365 rename to test/corpus/bar/baz/cur/26:2,\r
 366 diff --git a/test/corpus/cur/27:2, b/test/corpus/bar/baz/new/27:2,\r
 367 similarity index 100%\r
 368 rename from test/corpus/cur/27:2,\r
 369 rename to test/corpus/bar/baz/new/27:2,\r
 370 diff --git a/test/corpus/cur/28:2, b/test/corpus/bar/baz/new/28:2,\r
 371 similarity index 100%\r
 372 rename from test/corpus/cur/28:2,\r
 373 rename to test/corpus/bar/baz/new/28:2,\r
 374 diff --git a/test/corpus/cur/19:2, b/test/corpus/bar/cur/19:2,\r
 375 similarity index 100%\r
 376 rename from test/corpus/cur/19:2,\r
 377 rename to test/corpus/bar/cur/19:2,\r
 378 diff --git a/test/corpus/cur/20:2, b/test/corpus/bar/cur/20:2,\r
 379 similarity index 100%\r
 380 rename from test/corpus/cur/20:2,\r
 381 rename to test/corpus/bar/cur/20:2,\r
 382 diff --git a/test/corpus/cur/21:2, b/test/corpus/bar/new/21:2,\r
 383 similarity index 100%\r
 384 rename from test/corpus/cur/21:2,\r
 385 rename to test/corpus/bar/new/21:2,\r
 386 diff --git a/test/corpus/cur/22:2, b/test/corpus/bar/new/22:2,\r
 387 similarity index 100%\r
 388 rename from test/corpus/cur/22:2,\r
 389 rename to test/corpus/bar/new/22:2,\r
 390 diff --git a/test/corpus/cur/06:2, b/test/corpus/foo/06:2,\r
 391 similarity index 100%\r
 392 rename from test/corpus/cur/06:2,\r
 393 rename to test/corpus/foo/06:2,\r
 394 diff --git a/test/corpus/cur/11:2, b/test/corpus/foo/baz/11:2,\r
 395 similarity index 100%\r
 396 rename from test/corpus/cur/11:2,\r
 397 rename to test/corpus/foo/baz/11:2,\r
 398 diff --git a/test/corpus/cur/12:2, b/test/corpus/foo/baz/12:2,\r
 399 similarity index 100%\r
 400 rename from test/corpus/cur/12:2,\r
 401 rename to test/corpus/foo/baz/12:2,\r
 402 diff --git a/test/corpus/cur/13:2, b/test/corpus/foo/baz/cur/13:2,\r
 403 similarity index 100%\r
 404 rename from test/corpus/cur/13:2,\r
 405 rename to test/corpus/foo/baz/cur/13:2,\r
 406 diff --git a/test/corpus/cur/14:2, b/test/corpus/foo/baz/cur/14:2,\r
 407 similarity index 100%\r
 408 rename from test/corpus/cur/14:2,\r
 409 rename to test/corpus/foo/baz/cur/14:2,\r
 410 diff --git a/test/corpus/cur/15:2, b/test/corpus/foo/baz/new/15:2,\r
 411 similarity index 100%\r
 412 rename from test/corpus/cur/15:2,\r
 413 rename to test/corpus/foo/baz/new/15:2,\r
 414 diff --git a/test/corpus/cur/16:2, b/test/corpus/foo/baz/new/16:2,\r
 415 similarity index 100%\r
 416 rename from test/corpus/cur/16:2,\r
 417 rename to test/corpus/foo/baz/new/16:2,\r
 418 diff --git a/test/corpus/cur/07:2, b/test/corpus/foo/cur/07:2,\r
 419 similarity index 100%\r
 420 rename from test/corpus/cur/07:2,\r
 421 rename to test/corpus/foo/cur/07:2,\r
 422 diff --git a/test/corpus/cur/08:2, b/test/corpus/foo/cur/08:2,\r
 423 similarity index 100%\r
 424 rename from test/corpus/cur/08:2,\r
 425 rename to test/corpus/foo/cur/08:2,\r
 426 diff --git a/test/corpus/cur/03:2, b/test/corpus/foo/new/03:2,\r
 427 similarity index 100%\r
 428 rename from test/corpus/cur/03:2,\r
 429 rename to test/corpus/foo/new/03:2,\r
 430 diff --git a/test/corpus/cur/09:2, b/test/corpus/foo/new/09:2,\r
 431 similarity index 100%\r
 432 rename from test/corpus/cur/09:2,\r
 433 rename to test/corpus/foo/new/09:2,\r
 434 diff --git a/test/corpus/cur/10:2, b/test/corpus/foo/new/10:2,\r
 435 similarity index 100%\r
 436 rename from test/corpus/cur/10:2,\r
 437 rename to test/corpus/foo/new/10:2,\r
 438 diff --git a/test/corpus/cur/04:2, b/test/corpus/new/04:2,\r
 439 similarity index 100%\r
 440 rename from test/corpus/cur/04:2,\r
 441 rename to test/corpus/new/04:2,\r
 442 -- \r
 443 1.9.0\r
 444 \r