[Svnmerge] Property conflicts using 1.5-Client with svnmerge

[Hermanns, Horst]

Hello,

we got a problem using 1.5-Client (1.5.1, Server is still 1.4) with
svnmerge.

Before running the 'svn merge --force' command, svnmerge adapts the
property locally to avoid conflicts for property changes of the source
during the merge. Afterwards it starts with the first merge command.

	...
	svn --non-interactive propset "svnmerge-integrated" -F
"/tmp/tmpKmhKVA" "."
	...
	svn --non-interactive merge --force -r 1170:1171 http://... .
	...

With 1.4-client everthing works fine, but the 1.5-client seems to have
another behavier.
It detects a conflict for the porperty change during the merge because
of the prior changed property with the message:

"Trying to change property 'svnmerge-integrated' from '...' to '...',
but property has been locally changed from '...' to '...'."
 

Does anybody have experience with svnmerge and 1.5-client.
Any idea to avoid this problem or is it not recommended to use
1.5-client with svnmerge?

Best regards
Horst Hermanns

---------------------------------------- 
Horst Hermanns
Product Support Services, QTS
Products & Innovation 

Deutsche Telekom AG 
T-Online-Allee 1
D-64295 Darmstadt 
Tel +49 6151 680 - 5877
E-Mail: h.hermanns at telekom.de
http://www.telekom.de