Mercurial > hg
diff tests/test-convert-svn-move @ 6851:6ec941b6003d
Fix subversion tests with svn 1.5
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 30 Jul 2008 22:26:41 +0200 |
parents | 075b2c9aed37 |
children | 90d8dfb481e7 |
line wrap: on
line diff
--- a/tests/test-convert-svn-move Sun Jul 27 17:09:33 2008 +0200 +++ b/tests/test-convert-svn-move Wed Jul 30 22:26:41 2008 +0200 @@ -58,10 +58,19 @@ svn rm subproject/trunk/d2 svn ci -m "changeb and rm d2" svn mv $svnurl/subproject/trunk/d1 $svnurl/subproject/branches/d1 -m moved1again -echo % copy a file from a past revision -svn copy -r 7 $svnurl/subproject/trunk/d2/d $svnurl/subproject/trunk -m copyfilefrompast -echo % copy a directory from a past revision -svn copy -r 7 $svnurl/subproject/trunk/d2 $svnurl/subproject/trunk -m copydirfrompast + +if svn help copy | grep 'SRC\[@REV\]' > /dev/null 2>&1; then + # SVN >= 1.5 replaced the -r REV syntax with @REV + echo % copy a file from a past revision + svn copy $svnurl/subproject/trunk/d2/d@7 $svnurl/subproject/trunk -m copyfilefrompast + echo % copy a directory from a past revision + svn copy $svnurl/subproject/trunk/d2@7 $svnurl/subproject/trunk -m copydirfrompast +else + echo % copy a file from a past revision + svn copy -r 7 $svnurl/subproject/trunk/d2/d $svnurl/subproject/trunk -m copyfilefrompast + echo % copy a directory from a past revision + svn copy -r 7 $svnurl/subproject/trunk/d2 $svnurl/subproject/trunk -m copydirfrompast +fi cd .. echo % convert trunk and branches