pre.bat

rem this script will Iterate to the list of folders in the working copy and merge the trunk with the changes in branch
echo off
set home=C:\Users\test\Desktop\RELEASE2-BRANCH
set log=C:\Users\test\Desktop\log
set t=%date%_%time%
set d=%t:~10,4%%t:~7,2%%t:~4,2%_%t:~15,2%%t:~18,2%%t:~21,2%
set branch=
set trunk=
CD %home%
FOR /D %%A IN (*) DO (
    CD %%A
	echo Starting merge for %branch%/%%A >> %log%/%d%-merge.txt 2>> %log%/%d%_mergeerror.txt
	
	echo merging "%trunk%" to "%branch%"
	svn info "%trunk%" | findstr /B URL >> %log%/%d%-merge.txt 2>> %log%/%d%_mergeerror.txt
	svn info "%branch%"  | findstr /B URL >> %log%/%d%-merge.txt 2>> %log%/%d%_mergeerror.txt
	svn merge "%trunk%/%%A"  "%branch%/%%A" --accept postpone >> %log%/%d%-merge.txt 2>> %log%/%d%_mergeerror.txt
	
	CD %home%
	)

rem use the below script to get the svn revision
:function to get svn revision
REM svn info -rHEAD %cd%|find "URL"> %temp%\__svnrev.tmp
REM set /p revision=< %temp%\__svnrev.tmp
REM del %temp%\__svnrev.tmp
REM set revision=%revision:~10%
REM echo %revision%