Index: scripts/internal/svntag_single.bat
===================================================================
diff -u -N -r0dad97fd1b1e4c79c037b3b638181c2214c0d8f8 -r03340b954ead8138d669ee4f8df7124dc84c5612
--- scripts/internal/svntag_single.bat	(.../svntag_single.bat)	(revision 0dad97fd1b1e4c79c037b3b638181c2214c0d8f8)
+++ scripts/internal/svntag_single.bat	(.../svntag_single.bat)	(revision 03340b954ead8138d669ee4f8df7124dc84c5612)
@@ -1,5 +1,7 @@
 @echo off
 
+setlocal
+
 if [%1] == [] (
 	echo Usage: svntag_single.bat ReposAddress TextVersion 
 	exit /b 1
@@ -13,13 +15,18 @@
 	exit /b 1
 )
 
-call internal\clear_env.bat
-if errorlevel 1 (
-	exit /b 1
+rem partial cleanup
+SET CHTmpDir=%TmpDir%\repo-tag-test
+if exist "%CHTmpDir%" (
+	rmdir /S /Q "%CHTmpDir%" >nul
+	if exist "%CHTmpDir%" (
+		echo ERROR: Deleting the old temporary folder failed.
+		exit /b 1
+	)
 )
 
 rem check if the project isn't already tagged
-svn co "%ReposAddress%/tags/%TextVersion%" "%MainProjectDir%" 2>nul
+svn co "%ReposAddress%/tags/%TextVersion%" "%CHTmpDir%" 2>nul
 if errorlevel 1 (
 	rem when error, it probably means that the tag does not exist
 	goto create
@@ -33,7 +40,7 @@
 echo    * Tagging %ReposAddress% as %TextVersion%...
 svn cp -m "Tagged project to %TextVersion%" "%ReposAddress%/trunk/" "%ReposAddress%/tags/%TextVersion%" >"%TmpDir%\command.log"
 if errorlevel 1 (
-	echo ERROR: encountered a problem while tagging libicpf project. See the log below:
+	echo ERROR: encountered a problem while tagging %ReposAddress% project. See the log below:
 	type "%TmpDir%\command.log"
 	exit /b 1
 )