Daniel Rall wrote:
> On Tue, 24 Jan 2006, Kevin P. Fleming wrote:
>
>
>>Fixes silly double-execution of format_merge_props that breaks
>>'svnmerge.py block' operation.
>>
>>Index: svnmerge.py
>>===================================================================
>>--- svnmerge.py (revision 18211)
>>+++ svnmerge.py (working copy)
>>@@ -404,7 +404,7 @@
>> del props[head_path]
>> props = format_merge_props(props)
>> if props:
>>- _run_propset(dir, opts["block_prop"], format_merge_props(props))
>>+ _run_propset(dir, opts["block_prop"], props)
>> else:
>> svn_command('propdel "%s" "%s"' % (opts["block_prop"], dir))
>
>
> Looks good. No other side effects from turning off the double-formatting?
If you leave the double call in place, the program aborts with a Python
error, since format_merge_props is being passed a string the second
time, instead of the proper argument type.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jan 25 15:54:53 2006