Going through the subversion/libsvn_fs_base/notes/structure Merging
Algorithm section
"Else:
Changes were made to this entry both within the transaction and
to the repository while the transaction was in progress. They
must be merged or declared to be in conflict.".
Just thought of testing deleting and commiting same file/directory from
2 working copies in a sequence and see what the second commit reports back.
I expected that second commit would report 'Out Of Date Error'
unfortunately it is not, commit successfully goes through with a new
revison, even though the only transactions and revision tables alone
getting updated to my bdb repository not the changes and nodes.
Snippet to reproduce the behaviour.
cd /tmp
rm -rf repos
svnadmin create repos --fs-type=bdb
rm -rf wc
mkdir wc
svn mkdir file:///tmp/repos/abc -m 'creating abc'
svn co file:///tmp/repos wc/wc1
svn co file:///tmp/repos wc/wc2
curdir=`pwd`
cd wc/wc1
echo 'ls from ' `pwd`
ls
svn rm abc
svn ci -m 'removing abc from wc1'
cd $curdir
cd wc/wc2
echo 'ls from ' `pwd`
ls
svn rm abc
svn ci -m 'removing abc from wc2'
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 17 12:49:02 2006