On Fri, 28 Sep 2007, David Glasser 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?
Looks good to me. There is a separate svnmerge.py mailing list;
you might want to run it up the flagpole there as well.
- application/pgp-signature attachment: stored
Received on Sat Sep 29 02:27:05 2007