set REPO_PATH="D:\Development\SVN\Repositories\test" set REPO_URL="file:///D:/Development/SVN/Repositories/test" set WS_PATH="D:\Development\SVN\Workspaces\test" svnadmin create %REPO_PATH% svn checkout %REPO_URL%@HEAD %WS_PATH% mkdir %WS_PATH%\trunk mkdir %WS_PATH%\trunk\project mkdir %WS_PATH%\branches svn add %WS_PATH%\trunk svn add %WS_PATH%\branches echo foo>ignore.txt svn propset svn:ignore -F ignore.txt %WS_PATH%\trunk\project svn commit %WS_PATH% -m "Initialize repository." svn copy --parents %REPO_URL%/trunk/project@HEAD %REPO_URL%/branches/test/project -m "Branched /trunk/project to /branches/test/project." svn update %WS_PATH% REM Senario 1: Change svn:ignore on /branches/test/project and merge it back to /trunk echo foo>ignore.txt echo bar>>ignore.txt svn propset svn:ignore -F ignore.txt %WS_PATH%\branches\test\project svn commit %WS_PATH% -m "Change svn:ignore for project." svn merge %REPO_URL%/branches/test/project %WS_PATH%\trunk\project svn commit %WS_PATH% -m "Merged /branches/test/project to /trunk/project." REM Senario 2: Change svn:ignore on /branches/test/project again and merge it back to /trunk echo foo>ignore.txt echo bar>>ignore.txt echo baz>>ignore.txt svn propset svn:ignore -F ignore.txt %WS_PATH%\branches\test\project svn commit %WS_PATH%\ -m "Change svn:ignore for project." svn merge %REPO_URL%/branches/test/project %WS_PATH%\trunk\project svn commit %WS_PATH% -m "Merged /branches/test/project to /trunk/project."