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
Received on Wed Jan 25 00:07:33 2006