[Svnmerge] [PATCH] svnmerge needs to use --non-interactive

[Giovanni Bajo]

On Fri, 28 Sep 2007 16:34:16 -0700, "David Glasser"
<glasser at davidglasser.net> wrote:

> In trunk svn, "svn merge" can produce a prompt for conflicts, breaking
> svnmerge.py (which hides IO from the user).  Ideally, the user should
> just be able to use the conflict handler during svnmerge.py's call to
> "svn merge", but at the very least it shouldn't hang.  This appears to
> work:
> 
> 
> ===================================================================
> --- contrib/client-side/svnmerge/svnmerge.py	(revision 26831)
> +++ contrib/client-side/svnmerge/svnmerge.py	(working copy)
> @@ -298,7 +298,7 @@ def launchsvn(s, show=False, pretend=Fal
>          password = " --password=" + password
>      else:
>          password = ""
> -    cmd = opts["svn"] + username + password + " " + s
> +    cmd = opts["svn"] + " --non-interactive " + username + password + "
"
> + s
>      if show or opts["verbose"] >= 2:
>          print cmd
>      if pretend:
> 
> 
> 
> Should I commit this?

+1. I hope you have verified that --non-interactive is accepted for "svn
merge" by released versions :)
-- 
Giovanni Bajo