Mercurial > hg-stable
changeset 23675:96529f81e2e9
tests: run 'cvs init' only on non-existent directories (issue4482)
Do not create cvsroot directory since cvs-1.12 errors out
if CVSROOT exists before 'cvs init'.
| author | Thomas Klausner <tk@giga.or.at> |
|---|---|
| date | Sun, 28 Dec 2014 21:30:52 +0100 |
| parents | 6e36b9fc7869 |
| children | e8b09f920fe6 |
| files | tests/test-convert-cvs-branch.t tests/test-convert-cvs-detectmerge.t tests/test-convert-cvs-synthetic.t tests/test-convert-cvs.t tests/test-convert-cvsnt-mergepoints.t |
| diffstat | 5 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-cvs-branch.t Thu Dec 25 21:50:35 2014 -0500 +++ b/tests/test-convert-cvs-branch.t Sun Dec 28 21:30:52 2014 +0100 @@ -23,6 +23,7 @@ $ CVS_OPTIONS=-f $ export CVS_OPTIONS $ cd .. + $ rmdir cvsrepo $ cvscall -q -d "$CVSROOT" init Create a new project
--- a/tests/test-convert-cvs-detectmerge.t Thu Dec 25 21:50:35 2014 -0500 +++ b/tests/test-convert-cvs-detectmerge.t Sun Dec 28 21:30:52 2014 +0100 @@ -33,7 +33,6 @@ create cvs repository with one project - $ mkdir cvsrepo $ cvscall -q -d "$CVSROOT" init $ mkdir cvsrepo/proj
--- a/tests/test-convert-cvs-synthetic.t Thu Dec 25 21:50:35 2014 -0500 +++ b/tests/test-convert-cvs-synthetic.t Sun Dec 28 21:30:52 2014 +0100 @@ -14,6 +14,7 @@ $ CVS_OPTIONS=-f $ export CVS_OPTIONS $ cd .. + $ rmdir cvsrepo $ cvscall() > { > cvs -f "$@"
--- a/tests/test-convert-cvs.t Thu Dec 25 21:50:35 2014 -0500 +++ b/tests/test-convert-cvs.t Sun Dec 28 21:30:52 2014 +0100 @@ -33,6 +33,7 @@ $ CVS_OPTIONS=-f $ export CVS_OPTIONS $ cd .. + $ rmdir cvsrepo $ cvscall -q -d "$CVSROOT" init create source directory
--- a/tests/test-convert-cvsnt-mergepoints.t Thu Dec 25 21:50:35 2014 -0500 +++ b/tests/test-convert-cvsnt-mergepoints.t Sun Dec 28 21:30:52 2014 +0100 @@ -32,6 +32,7 @@ $ CVS_OPTIONS=-f $ export CVS_OPTIONS $ cd .. + $ rmdir cvsmaster $ filterpath cvscall -Q -d "$CVSROOT" init checkout #1: add foo.txt