I believe the following steps should give an error or merge the change
into the moved file:
svnadmin create repos
svn co file://`pwd`/repos r1
cd r1
touch a
svn add a
svn ci -F /dev/null
cd ..
svn co file://`pwd`/repos r2
cd r2
svn mv a b
cd ../r1
cat /etc/group > a
svn ci -F /dev/null
cd ../r2
svn update
Here, the a file in r2 is updated, even though it will be moved to b.
The "svn commit" will end up commit the old version of the file.
Two choices: Complain on the svn update or merge the changes in
"a" to "b".
SVN-1141 Tree changes and text changes don't conflict
