diff options
Diffstat (limited to 'tests/test-mq-subrepo-svn.t')
| -rw-r--r-- | tests/test-mq-subrepo-svn.t | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/tests/test-mq-subrepo-svn.t b/tests/test-mq-subrepo-svn.t index 39e5c0b..9ed9121 100644 --- a/tests/test-mq-subrepo-svn.t +++ b/tests/test-mq-subrepo-svn.t @@ -1,4 +1,4 @@ - $ "$TESTDIR/hghave" svn13 || exit 80 + $ "$TESTDIR/hghave" svn || exit 80 $ echo "[extensions]" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH @@ -16,29 +16,28 @@ fn to create new repository, and cd into it handle svn subrepos safely $ svnadmin create svn-repo-2499 - - $ SVNREPOPATH=`pwd`/svn-repo-2499/project -#if windows - $ SVNREPOURL=file:///`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"` -#else - $ SVNREPOURL=file://`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"` -#endif - + $ curpath=`pwd | tr '\\\\' /` + $ expr "$svnpath" : "\/" > /dev/null + > if [ $? -ne 0 ]; then + > curpath="/$curpath" + > fi + $ svnurl="file://$curpath/svn-repo-2499/project" $ mkdir -p svn-project-2499/trunk - $ svn import -m 'init project' svn-project-2499 "$SVNREPOURL" - Adding svn-project-2499/trunk (glob) + $ svn import -m 'init project' svn-project-2499 "$svnurl" + Adding svn-project-2499/trunk Committed revision 1. qnew on repo w/svn subrepo $ mkrepo repo-2499-svn-subrepo - $ svn co "$SVNREPOURL"/trunk sub + $ svn co "$svnurl"/trunk sub Checked out revision 1. $ echo 'sub = [svn]sub' >> .hgsub $ hg add .hgsub $ hg status -S -X '**/format' A .hgsub $ hg qnew -m0 0.diff + committing subrepository sub $ cd sub $ echo a > a $ svn add a @@ -50,5 +49,3 @@ qnew on repo w/svn subrepo $ hg qnew -m1 1.diff abort: uncommitted changes in subrepository sub [255] - - $ cd .. |