Scenario that produces a conflict in svn:mergeinfo

[Mark Phippard <ma...@gmail.com>]

Can someone take a look at this recipe and tell me if this is a bug?
I thought we always just magically deal with the svn:mergeinfo
property.

The following recipe came from someone on the merge tracking early
adopter forum.  I had asked if they did any svn up's which is probably
why the recipe includes so many.  When I reproduced it I used svn cp
-g just in case that contributed to the problem.


svnadmin create rep
svn co file:///home/username/rep co
cd co
svn mkdir trunk
svn mkdir branches
svn ci -m"init struct"
svn up

touch trunk/foo
svn add trunk/foo
svn ci -m"add foo"
svn up

svn cp trunk branches/one
svn ci -m"created branch one"
svn up
svn cp trunk branches/two
svn ci -m"created branch two"
svn up

touch trunk/foo1
svn add trunk/foo1
svn ci -m"add foo1"
svn up
cd branches/one/
svn merge ../../trunk
svn ci -m"merged from trunk"
svn up
cd ../two
svn merge ../../trunk
svn ci -m"merged from trunk"
svn up

touch bar
svn add bar
svn ci -m"change in two"
svn up
cd ../../trunk/
svn merge ../branches/two
svn up
svn ci -m"got changes from two"
cd ..
svn up
cd branches/one/
svn merge ../../trunk
cat dir_conflicts.prej

Trying to create property 'svn:mergeinfo' with value
'/branches/two:7-8
/trunk:2-6',
but it already exists.


-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org