Re: [PATCH] svnmerge needs to use --non-interactive

On 9/28/07, Daniel L. Rall <dlr@finemaltcoding.com> wrote:
> On Fri, 28 Sep 2007, Daniel L. Rall wrote:
>
> > 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.
>
> Ah, you did include the other list address, sorry for the noise.

Well, I did CC it, but I think I am getting moderated since I'm not on it.

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org