Kevin P. Fleming <kpfleming@digium.com> 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.
Thanks for the patch (and thanks to Daniel for committing it!). I have a more
complete testsuite (not yet committed to trunk, but will be soon!) which
executes svnmerge over a test repository, but it doesn't cover block/unblock
yet. Does it show? :)
Giovanni Bajo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 26 00:29:56 2006