[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Small patch for svnmerge.py

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-01-25 18:48:04 CET

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

  • application/pgp-signature attachment: stored
Received on Wed Jan 25 19:08:45 2006

This is an archived mail posted to the Subversion Dev mailing list.