[Svnmerge] Re: svn commit: r18649 - trunk/contrib/client-side

[Giovanni Bajo]

djames at tigris.org wrote:

> --- trunk/contrib/client-side/svnmerge.py (original) +++
> trunk/contrib/client-side/svnmerge.py Tue Feb 28 13:25:28 2006 @@
>      -631,7 +631,7 @@ # the --verbose flag, the --quiet flag prevents
>      the commit log # message from being printed.
>      log_opts = '--quiet -r%s:%s "%s"' % (begin, end, url)
> -    if opts["bidirectional"]:
> +    if opts.has_key("bidirectional") and opts["bidirectional"]:
>          log_opts = "--verbose " + log_opts
>      lines = launchsvn("log %s" % log_opts)

> @@ -679,7 +679,7 @@
>      phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs
>      reflected_revs = []
>
> -    if opts["bidirectional"]:
> +    if opts.has_key("bidirectional") and opts["bidirectional"]:
>          report("checking for reflected changes in %d revision(s)"
>                 % len(prop_changed_revs))

This is also pretty weird, as opts should automatically acquires defaults for
every option through the Option machinery. Did you investigate why it's not
needed for any other option?

Thanks for the "block" testcase BTW!

Giovanni Bajo