Mercurial > hg-stable
changeset 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 | c6bb8fae3bd2 |
| children | 8dc510c4caee 2ff0829bdae5 |
| files | tests/test-convert-svn-branches tests/test-convert-svn-move tests/test-convert-svn-tags tests/test-convert-svn-tags.out |
| diffstat | 4 files changed, 18 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-svn-branches Sun Jul 27 17:09:33 2008 +0200 +++ b/tests/test-convert-svn-branches Wed Jul 30 22:26:41 2008 +0200 @@ -58,7 +58,7 @@ svn ci -m "change b" echo % create a cross-branch revision -svn move -m "move b" trunk/b branches/old/c +svn move trunk/b branches/old/c "$TESTDIR/svn-safe-append.py" c branches/old/c svn ci -m "move and update c"
--- 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
--- a/tests/test-convert-svn-tags Sun Jul 27 17:09:33 2008 +0200 +++ b/tests/test-convert-svn-tags Wed Jul 30 22:26:41 2008 +0200 @@ -31,7 +31,7 @@ cd .. svnurl=file://$svnpath/svn-repo/projA -svn import -m "init projA" projA $svnurl | fix_path +svn import -m "init projA" projA $svnurl | fix_path | sort echo % update svn repository svn co $svnurl A | fix_path
--- a/tests/test-convert-svn-tags.out Sun Jul 27 17:09:33 2008 +0200 +++ b/tests/test-convert-svn-tags.out Wed Jul 30 22:26:41 2008 +0200 @@ -1,9 +1,9 @@ % initial svn import + +Adding projA/branches +Adding projA/tags Adding projA/trunk Adding projA/unrelated -Adding projA/branches -Adding projA/tags - Committed revision 1. % update svn repository A A/trunk