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

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

From: Senthil Kumaran S <senthil_at_collab.net>
Date: 2007-07-12 15:59:59 CEST

Ben Collins-Sussman wrote:
> 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'.

I feel that, when we are not changing anything using the editor and
failing, we must not change the status ie., from C to M and quit.

For example, when we change the status to M, In this case if I do a svn
up for the second time, there is no error displayed and .mine is applied
on the wc, in which case .their is lost. This may be an intended
behavior, please correct me if I am wrong.

> 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.

I think this will be an ideal fix to do.

--
Senthil Kumaran S
http://www.stylesen.org
---------------------------------------------------------------------
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:59:27 2007

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