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

[Mads Kiilerich]

alexandrul.ct at gmail.com wrote, On 06/20/2012 01:34 AM:
> # HG changeset patch
> # User Eduard-Cristian Stefan <alexandrul.ct at gmail.com>
> # Date 1340147994 -10800
> # Node ID 32693b51f4d5e3fb8283fafd254fe578ebe8be58
> # Parent  7f32ce540744e5d0ae353f90d33af8d6d1c9cb32
> test-subrepo-svn.t: adapt for Windows

Thanks, but

> 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,12 +9,18 @@
>   don't. Handle that.
>   
>     $ escapedwd=`pwd | fix_path`
> +#if no-windows
>     $ expr "$escapedwd" : '\/' > /dev/null || escapedwd="/$escapedwd"
>     $ escapedwd=`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$escapedwd"`
> +#endif

(These subversions tests are ugly ... and adding full windows support 
makes them even more ugly. It would be nice to get that cleaned up somehow.)

>   create subversion repo
>   
> +#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
> @@ -24,17 +30,17 @@
>     $ echo alpha > src/alpha
>     $ svn add src
>     A         src
> -  A         src/alpha
> +  A         src/alpha (glob)
>     $ mkdir externals
>     $ echo other > externals/other
>     $ svn add externals
>     A         externals
> -  A         externals/other
> +  A         externals/other (glob)
>     $ svn ci -m 'Add alpha'
>     Adding         externals
> -  Adding         externals/other
> +  Adding         externals/other (glob)
>     Adding         src
> -  Adding         src/alpha
> +  Adding         src/alpha (glob)
>     Transmitting file data ..
>     Committed revision 1.
>     $ svn up -q
> @@ -174,7 +180,7 @@
>   this commit fails because of meta changes
>   
>     $ svn propset svn:mime-type 'text/html' s/alpha
> -  property 'svn:mime-type' set on 's/alpha'
> +  property 'svn:mime-type' set on 's/alpha' (glob)
>     $ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") | grep -vi 'out of date'
>     committing subrepository s
>     abort: svn:*Commit failed (details follow): (glob)
> @@ -205,7 +211,7 @@
>   this commit fails because of externals meta changes
>   
>     $ svn propset svn:mime-type 'text/html' s/externals/other
> -  property 'svn:mime-type' set on 's/externals/other'
> +  property 'svn:mime-type' set on 's/externals/other' (glob)
>     $ hg ci --subrepos -m 'amend externals from hg'
>     committing subrepository s
>     abort: cannot commit svn externals
> @@ -394,6 +400,7 @@
>      U   *s (glob)
>     
>     Fetching external item into '*s/externals'* (glob)
> +  A    s/externals/other (glob)

An extra line of output? That looks like a bug somewhere. Please try to 
track it down.

/Mads