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

Re: svn commit: r1875312 - /subversion/site/publish/docs/release-notes/1.14.html

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Thu, 19 Mar 2020 00:28:47 +0000

Nathan Hartman wrote on Wed, 18 Mar 2020 23:59 +00:00:
> On Wed, Mar 18, 2020 at 2:42 PM Daniel Shahaf <d.s_at_daniel.shahaf.name> wrote:
> > Nathan Hartman wrote on Wed, 18 Mar 2020 13:42 -0400:
> > > On Tue, Mar 17, 2020 at 3:50 PM Daniel Shahaf <d.s_at_daniel.shahaf.name> wrote:
> > > > Suggest to say "When invoking the user-defined editor", with or without
> > > > listing some of the ways in which the editor command may be specified.
> > > > Add an example? (An example is worth a thousand words…)
> > >
> > > Thanks for your suggestions.
> > >
> > > How about something along these lines:
> >
> > Thanks, much better :-)
> >
> > To clarify, what I thought specifically was to give examples of
> > problematic filename and of an editor command that uses shell. For
> > example, a screenshot:
> >
> > [[[
> > % svn up
> > Updating '.':
> > C foo bar.txt
> > Updated to revision 2.
> > Summary of conflicts:
> > Text conflicts: 1
> > Merge conflict discovered in file 'foo bar.txt'.
> > Select: (p) Postpone, (df) Show diff, (e) Edit file, (m) Merge,
> > (s) Show all options: <b>e</b>
> > ]]]
> >
> > As to an editor command, I guess something as simple as
> > «--editor-cmd='vim -N'» would suffice to get the point across.
>
> Yes, I think that's a good idea. May I use your "screenshot" as-is?
>

Certainly.

> Something like this:

+1, LGTM.

> <p>For example, suppose that <tt>$SVN_EDITOR</tt> is set as follows:</p>
>
> <pre>SVN_EDITOR='vim -N'
> export SVN_EDITOR
> </pre>

Should this read «SVN_EDITOR='vim -N --'»? (Or we could change the C code
to add the "--" between the editor command and the filename, but that might
break somebody's proverbial spacebar heating.)

Cheers,

Daniel
Received on 2020-03-19 01:29:58 CET

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.