Gunnar Dalsnes <har...@online.no> writes: > REM change this to the dir you are running the script from > set wd=c:/temp/test > > svnadmin create repo > > svn mkdir file:///%wd%/repo/trunk -m test > > svn co file:///%wd%/repo/trunk trunk1 > svn co file:///%wd%/repo/trunk trunk2
trunk2 is an empty directory at r1 > > svn copy trunk1 file:///%wd%/repo/branch -m branch > > svn co file:///%wd%/repo/branch branch > > pushd branch > md dir1 > pushd dir1 > echo > file2.txt > popd > svn add * > svn commit -m test > > popd > > pushd trunk1 > svn update > md dir1 > pushd dir1 > echo > file1.txt > popd > svn add * > svn commit -m test > > popd > > pushd trunk2 > > svn merge file:///%wd%/repo/branch@4 > > REM tree conflict > > svn resolve --accept=working dir1 Did you miss a step? trunk2 is still an empty directory at r1, how can that cause a conflict. > > svn up > > REM Updating '.': > REM A dir1\file1.txt > > REM It says dir1\file1.txt is added, but it's nowhere to be seen > dir dir1 > svn status dir1 > > svn resolve --accept=working dir1 > svn revert dir1\file1.txt > > REM Nope, file is still deleted. Impossible to undelete it. > popd > > popd > > ---end script--- > > > Another small issue: > svn merge don't seem to like backslash in file urls: > C:\temp\test\trunk2>svn merge file:///C:\temp\test\trunk2/repo/branch@4 > svn: E180001: Unable to connect to a repository at URL > file:///C:%5Ctemp%5Ctest > %5Ctrunk2/repo/branch' > svn: E180001: Unable to open an ra_local session to URL > svn: E180001: Unable to open repository > file:///C:%5Ctemp%5Ctest%5Ctrunk2/repo/ > branch' > > Otoh, svn co and svn mkdir etc. seems to work with backslash in file urls. > > > thanks, > Gunnar Dalsnes > -- Philip
