problem with external merge program on current trunk

If I use an external program when merging with the current version on trunk of svn (svn merge), I see that finally not the output of the external program is saved but the output of the internal merge.
What I have seen is that the routine svn_wc_merge first is called from the routine install_file. This one is calling the external merge program. But after that the svn_wc_merge routine is called again from inside the svn_wc__run_log routine doing a merge on the same file, and this one is calling the internal merge routine and is overwriting the output of the first merge.
(I am running svn.exe on windows)
I think the problem was introduced somewhere between revision 9813 and 9866.

Is this really a bug and should I file an issue for this?

Regards,
Marc

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jun 6 02:45:28 2004