[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: Mark Phippard <markphip_at_gmail.com>
Date: 2007-10-03 17:36:02 CEST

On 10/3/07, Eric Gillespie <epg@google.com> wrote:
> Eric Gillespie <epg@google.com> writes:
> > 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.
> >
>
> Try this patch (I haven't even compiled it):

Conceptually it works. Looks like it needs some \n inserted (perhaps
this explains the buffering with the current code too?)

$ svn merge -g
--- Merging r2 through r8 into '.':
U src/com/collabnet/banking/tests/BankingTests.java
Conflict discovered in 'src/com/collabnet/banking/models/BankAccount.java'.
Select: (p)ostpone, (d)iff, (e)dit, (h)elp : e
None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set,
and no 'editor-cmd' run-time configuration option was foundSelect:
(p)ostpone, (d)iff, (e)dit, (h)elp : e
None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set,
and no 'editor-cmd' run-time configuration option was foundSelect:
(p)ostpone, (d)iff, (e)dit, (h)elp : p
C src/com/collabnet/banking/models/BankAccount.java
U docs/products/index.html
U docs/about/index.html
subversion/libsvn_client/merge.c:1504: (apr_err=155015)
svn: One or more conflicts were produced while merging r1:8 into
'.' --
resolve all conflicts and rerun the merge to apply the remaining
unmerged revisions

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
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:36:18 2007

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