[PATCH] tests: revert 6cc4b14fb76b for 'test-convert-svn-encoding.t'

[Dan Villiom Podlaski Christiansen]

# HG changeset patch
# User Dan Villiom Podlaski Christiansen <danchr at gmail.com>
# Date 1286665134 18000
# Node ID 9f251c413768bff544c6d01b7fa7de712a5d5831
# Parent  2702d095de03932cf5c687b80c330588785aac83
tests: revert 6cc4b14fb76b for 'test-convert-svn-encoding.t'

6cc4b14fb76b changed it so that $TESTTMP was used instead of a
globbing pattern. This is incorrect for in the case of matching
against the URL-form of TESTTMP, as it would fail if $TMPDIR contained
a '+' or another similarly quoatable character.

diff --git a/tests/test-convert-svn-encoding.t b/tests/test-convert-svn-encoding.t
--- a/tests/test-convert-svn-encoding.t
+++ b/tests/test-convert-svn-encoding.t
@@ -14,7 +14,7 @@ Convert while testing all possible outpu
 
   $ hg --debug convert svn-repo A-hg
   initializing destination A-hg repository
-  reparent to file://$TESTTMP/svn-repo
+  reparent to file://*/svn-repo (glob)
   run hg sink pre-conversion action
   scanning source...
   found trunk at 'trunk'
@@ -23,7 +23,7 @@ Convert while testing all possible outpu
   found branch branché at 5
   found branch branchée at 6
   scanning: 1 revisions
-  reparent to file://$TESTTMP/svn-repo/trunk
+  reparent to file://*/svn-repo/trunk (glob)
   fetching revision log for "/trunk" from 4 to 0
   parsing revision 4 (2 changes)
   parsing revision 3 (4 changes)
@@ -33,18 +33,18 @@ Convert while testing all possible outpu
   '/branches' is not under '/trunk', ignoring
   '/tags' is not under '/trunk', ignoring
   scanning: 2 revisions
-  reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9
+  reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
   fetching revision log for "/branches/branché" from 5 to 0
   parsing revision 5 (1 changes)
-  reparent to file://$TESTTMP/svn-repo
-  reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9
+  reparent to file://*/svn-repo (glob)
+  reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
   found parent of branch /branches/branché at 4: /trunk
   scanning: 3 revisions
-  reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
+  reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
   fetching revision log for "/branches/branchée" from 6 to 0
   parsing revision 6 (1 changes)
-  reparent to file://$TESTTMP/svn-repo
-  reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
+  reparent to file://*/svn-repo (glob)
+  reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
   found parent of branch /branches/branchée at 5: /branches/branché
   scanning: 4 revisions
   scanning: 5 revisions
@@ -57,7 +57,7 @@ Convert while testing all possible outpu
   4 hello
   source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk at 2
   converting: 1/6 revisions (16.67%)
-  reparent to file://$TESTTMP/svn-repo/trunk
+  reparent to file://*/svn-repo/trunk (glob)
   scanning paths: /trunk/à 0/3 (0.00%)
   scanning paths: /trunk/à/é 1/3 (33.33%)
   scanning paths: /trunk/é 2/3 (66.67%)
@@ -70,14 +70,14 @@ Convert while testing all possible outpu
   converting: 2/6 revisions (33.33%)
   scanning paths: /trunk/à 0/4 (0.00%)
   gone from -1
-  reparent to file://$TESTTMP/svn-repo
-  reparent to file://$TESTTMP/svn-repo/trunk
+  reparent to file://*/svn-repo (glob)
+  reparent to file://*/svn-repo/trunk (glob)
   scanning paths: /trunk/è 1/4 (25.00%)
   copied to è from é@2
   scanning paths: /trunk/é 2/4 (50.00%)
   gone from -1
-  reparent to file://$TESTTMP/svn-repo
-  reparent to file://$TESTTMP/svn-repo/trunk
+  reparent to file://*/svn-repo (glob)
+  reparent to file://*/svn-repo/trunk (glob)
   scanning paths: /trunk/ù 3/4 (75.00%)
   mark /trunk/ù came from à:2
   à/é
@@ -95,12 +95,12 @@ Convert while testing all possible outpu
   converting: 3/6 revisions (50.00%)
   scanning paths: /trunk/è 0/2 (0.00%)
   gone from -1
-  reparent to file://$TESTTMP/svn-repo
-  reparent to file://$TESTTMP/svn-repo/trunk
+  reparent to file://*/svn-repo (glob)
+  reparent to file://*/svn-repo/trunk (glob)
   scanning paths: /trunk/ù 1/2 (50.00%)
   gone from -1
-  reparent to file://$TESTTMP/svn-repo
-  reparent to file://$TESTTMP/svn-repo/trunk
+  reparent to file://*/svn-repo (glob)
+  reparent to file://*/svn-repo/trunk (glob)
   è
   getting files: è 1/2 (50.00%)
   ù/é
@@ -108,17 +108,17 @@ Convert while testing all possible outpu
   1 branch to branch?
   source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5
   converting: 4/6 revisions (66.67%)
-  reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9
+  reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
   scanning paths: /branches/branché 0/1 (0.00%)
   0 branch to branch?e
   source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e at 6
   converting: 5/6 revisions (83.33%)
-  reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
+  reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
   scanning paths: /branches/branchée 0/1 (0.00%)
-  reparent to file://$TESTTMP/svn-repo
-  reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
-  reparent to file://$TESTTMP/svn-repo
-  reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
+  reparent to file://*/svn-repo (glob)
+  reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
+  reparent to file://*/svn-repo (glob)
+  reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
   updating tags
   .hgtags
   run hg sink post-conversion action