Hi. I have a case where updating to older version causes tree conflict, if update (to older revision) removes some folder and that folder has some global-ignores ignored sub-folder. I'm not sure if that's a bug but it is inconvenient for me...
The (windows cmd) script to create situation is attached. Basically, 1. The update removes folder 2. There's a unversioned subfolder in working copy 3. The subfolder is ignored via config file global-ignores svn version 1.9.0 (r1692801), windows If the unversioned folder is ignored via "svn:ignore" property then update does not trigger tree conflict (but sequence 'svn up -R PREV && svn up' still does...) Am I doing something wrong with global-ignores? Gert
@echo off SET testdir=test set URL=file:///%CD%/test/repos set URL=%URL:C:\=\% set URL=%URL:\=/% echo Base url for repo: %URL% RMDIR /Q /S %testdir% mkdir %testdir% || goto error svnadmin create %testdir%\repos || goto error svn mkdir %URL%/trunk -m "" || goto error svn co %URL%/trunk %testdir%\trunk || goto error mkdir %testdir%\trunk\test || goto error echo Test1 > %testdir%\trunk\test\a.txt || goto error svn add --parents %testdir%\trunk\test\a.txt || goto error svn ps svn:ignore bin %testdir%\trunk\test || goto error svn commit %testdir%\trunk -m "" || goto error ECHO svn:ignore is Ok to be in removed dir svn co %URL%/trunk %testdir%\wc1 || goto error mkdir %testdir%\wc1\test\bin || goto error REM check that working copy status is clean svn status %testdir%\wc1 || goto error svn up %testdir%\wc1 -r PREV || goto error ECHO 'svn up %testdir%\wc1' would cause tree conflict now ECHO 'svn up %testdir%\wc1 --force' would work ECHO. ECHO global-ignores is not Ok to be in removed dir svn co %URL%/trunk %testdir%\wc2 || goto error mkdir %testdir%\wc2\test\obj || goto error REM check that working copy status is clean svn status %testdir%\wc2 --config-option config:miscellany:global-ignores=obj || goto error svn up %testdir%\wc2 -r PREV --force --config-option config:miscellany:global-ignores=obj goto end :error echo The script did not work Ok. :end
