[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: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2007-10-03 10:06:03 CEST

On 10/3/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> On 10/2/07, Mark Phippard <markphip@gmail.com> wrote:
> >
> > > 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.
>
> Yes, this is a transcript from my Mac.

Are you all using recent/current trunk versions? Could anything have
happened in the mean time?

bye,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 3 10:06:21 2007

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