[PATCH] test-subrepo-svn.t: adapt for Windows

Patrick Mézard patrick at mezard.eu
Sun Jun 24 18:29:02 UTC 2012


Le 23/06/12 18:54, alexandrul.ct at gmail.com a écrit :
> # HG changeset patch
> # User Eduard-Cristian Stefan <alexandrul.ct at gmail.com>
> # Date 1340470448 -10800
> # Node ID 6a81e54bb3e61d5a539312f8dd96d430fdabb0a1
> # Parent  efd2e14f72353626355dc82465bdf23bf6416aa2
> test-subrepo-svn.t: adapt for Windows
> 
> hg forget 'notafile*' is changed to use a name that is valid on Windows so we
> still get the same error ... but the error message is disabled because it
> varies with the Windows version.
> 
> diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t
> --- a/tests/test-subrepo-svn.t
> +++ b/tests/test-subrepo-svn.t
> @@ -14,7 +14,11 @@
>  
>  create subversion repo

Can you try this:

diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t
--- a/tests/test-subrepo-svn.t
+++ b/tests/test-subrepo-svn.t
@@ -9,8 +9,8 @@
 don't. Handle that.
 
   $ escapedwd=`pwd | fix_path`
+  $ escapedwd=`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$escapedwd"`
   $ expr "$escapedwd" : '\/' > /dev/null || escapedwd="/$escapedwd"
-  $ escapedwd=`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$escapedwd"`
 
 create subversion repo


instead of the if/else below?

>  
> +#if no-windows
>    $ SVNREPO="file://$escapedwd/svn-repo"
> +#else
> +  $ SVNREPO="file:///$escapedwd/svn-repo"
> +#endif
>    $ WCROOT="`pwd`/svn-wc"
>    $ svnadmin create svn-repo
>    $ svn co "$SVNREPO" svn-wc

--
Patrick Mézard



More information about the Mercurial-devel mailing list