Re: loss of 'their file' upon non-existent EDITOR

On 7/12/07, Senthil Kumaran S <senthil@collab.net> wrote:

> If I give 'e', when my $EDITOR environment variable is not set,

...actually, we check for $EDITOR, $SVN_EDITOR, and also an
'editor-cmd' variable in ~/.subversion/config. If all of those fail,
*then* we throw the error. :-)

> <snip>
> svn: None of the environment variables SVN_EDITOR, VISUAL or EDITOR is
> set, and no 'editor-cmd' run-time configuration option was found
> </snip>
>
> Now when I do a "svn st" inside repos1_wc2 I get the status as:
>
> <snip>
> ! .
> M test.c
> </snip>
>
> which obviously loses .their file and merges with .mine file.

Huh? How is anything lost? The update simply aborted. If you 'svn
diff test.c', you should still see your local edit, as if you had
never run 'svn up'.

However, I agree that the proper behavior here is for our
conflict-callback implementation to catch the specific "editor not
found" svn_error_t, and clear the error. If there's no editor
available, the user should simply be re-prompted with the conflict
menu again. I can fix that in just a moment.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 12 15:35:05 2007