You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Kevin P. Fleming" <kp...@digium.com> on 2006/01/24 23:07:16 UTC
Small patch for svnmerge.py
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))
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Small patch for svnmerge.py
Posted by Daniel Rall <dl...@collab.net>.
On Wed, 25 Jan 2006, Kevin P. Fleming wrote:
> 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.
Thanks Kevin, committed to trunk in r18226. This is not a problem in
the 1.3.x line.
--
Daniel Rall
Re: Small patch for svnmerge.py
Posted by Giovanni Bajo <ra...@develer.com>.
Kevin P. Fleming <kp...@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
Re: Small patch for svnmerge.py
Posted by "Kevin P. Fleming" <kp...@digium.com>.
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
Re: Small patch for svnmerge.py
Posted by Daniel Rall <dl...@collab.net>.
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?
--
Daniel Rall