[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 01:31:55 CEST

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

> On 10/2/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> > On 10/2/07, Mark Phippard <markphip@gmail.com> wrote:
> > > On 10/2/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> > > > This patch looks pretty good to me. Can you commit it, and see if it
> > > > resolves the weird behavior that Mark was seeing?
> > >
> > > I was not seeing this, a user on the merge tracking forums reported it.
> > >
> > > Is it not easy to reproduce? I could get more info but I assumed
> > > anyone without the environment variables set could reproduce it.
> > >
> >
> > I know that Augie reported a similar bug when expermenting with his
> > 'external merge tool' patch, but I can't reproduce the problem myself.
> > When I unset $EDITOR, I see the error message after each time I press
> > "e" on a conflict:
> >
> > Conflict discovered in 'cvs2cl.pl'.
> > 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 : 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
>
> 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.

Can someone say what the behavior actually is? Or point me to
some previous thread...

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 3 01:32:16 2007

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