[SVN-4497] interactive conflicts resolver: poor error message when editor fails

• Type: Bug
• Status: Open
• Priority: Trivial
• Resolution: Unresolved
• Affects Version/s: 1.9.x
• Fix Version/s: nonblocking
• Component/s: cmdline client
• Labels: bite-sized uex
• Assignee: Unassigned
• Reporter: Daniel Shahaf
• Created: 17/May/14 18:29
• Updated: 19/May/14 12:14

Description

Set SVN_EDITOR=false, trigger an add-on-add or edit-on-edit property conflict,
and choose 'e' (edit):

[[[
Select: (p) postpone, (mf) my version, (tf) their version,
        (dc) display conflict, (e) edit property, (q) quit resolution,
        (h) help: e
system('false svn-lLbmsc') returned 1
Select: (p) postpone, (mf) my version, (tf) their version,
        (dc) display conflict, (e) edit property, (q) quit resolution,
        (h) help:
]]]

Two problems:

1. The error lacks an "svn: " prefix.

2. The error is too low-level; "Running the editor failed:" would not be amiss.

Also, the code that handles SVN_ERR_EXTERNAL_PROGRAM is repeated about half a
dozen times with little changes; consider consolidating those repetitions.