[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Issue 2950] New - Weird prompting to resolve conflicts when EDITOR is not defined

From: Eric Gillespie <epg_at_google.com>
Date: 2007-10-03 17:14:55 CEST

"Mark Phippard" <markphip@gmail.com> writes:

> On 10/3/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> > On 10/3/07, Mark Phippard <markphip@gmail.com> wrote:
> > > On 10/3/07, Erik Huelsmann <ehuels@gmail.com> wrote:
> > > > On 10/3/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> > > > > On 10/2/07, Mark Phippard <markphip@gmail.com> wrote:
> > > > > > Did you try this on your Mac? I get the same behavior as Augie when I
> > > > > > try this on OSX. I'll be happy to try it again after the patch is
> > > > > > committed.
> > > > >
> > > > > Yes, this is a transcript from my Mac.
> > > >
> > > > Are you all using recent/current trunk versions? Could anything have
> > > > happened in the mean time?
> > >
> > > Did a HEAD build last night and I still get it on OSX.
> >
> > I still can't reproduce on my Mac, using HEAD. Can you apply dlr's
> > proposed patch, see if it fixes the problem?
>
> I applied Dan's patch and I still have the problem. Other than
> changing the colors, I am just using the default OSX terminal.

We still need Dan's patch for other reasons, but it has nothing
to do with the problem. I updated the issue yesterday with an
explanation of the problem, and how to fix it.

------- Additional comments from Eric Gillespie Tue Oct 2 17:20:15 -0700 2007 -------

This happens because the prompt goes to stderr while the error message
goes to stdout (bogus). We need to change the rest of the prompt
callback to use svn_cmdline_fprintf(stderr).

As an aside, I don't see why this fails on Mac (isn't that where you
guys said you see this). On sane systems, stdout is line-buffered
when connected to a tty, so the error message should have gone through
anyway (as it does on Linux). I don't know why it's not, but that's
why adding the flush calls helped. We have a separate change in
progress (from dlr) to force stderr/stdout to buffer the way we like,
though, so it doesn't really matter.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 3 17:15:37 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.