[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: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-07-12 16:00:26 CEST

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

Ben, after this 'no editor failure' working copy revision moves up to
'latest' and hence no further updates are possible at all, I tried 'svn
revert problematic_file' and tried 'svn up' I could not get the latest
content.

Path: test.c
Name: test.c
URL: file:///tmp/repos1/test.c
Repository Root: file:///tmp/repos1
Repository UUID: c58e9a57-1135-0410-b94f-b241ce3a3ca8
Revision: 1
Node Kind: file
Schedule: normal
Last Changed Author: kamesh
Last Changed Rev: 1
Last Changed Date: 2007-07-12 19:25:08 +0530 (Thu, 12 Jul 2007)
Text Last Updated: 2007-07-12 19:25:09 +0530 (Thu, 12 Jul 2007)
Checksum: b1946ac92492d2347c6235b4d2611184

Conflict discovered in 'test.c'.
Select: (p)ostpone, (d)iff, (e)dit, (h)elp : e
../subversion/svn/util.c:135: (apr_err=205007)
svn: None of the environment variables SVN_EDITOR, VISUAL or EDITOR is
set, and no 'editor-cmd' run-time configuration option was found
Path: test.c
Name: test.c
URL: file:///tmp/repos1/test.c
Repository Root: file:///tmp/repos1
Repository UUID: c58e9a57-1135-0410-b94f-b241ce3a3ca8
Revision: 2
Node Kind: file
Schedule: normal
Last Changed Author: kamesh
Last Changed Rev: 2
Last Changed Date: 2007-07-12 19:25:10 +0530 (Thu, 12 Jul 2007)
Checksum: b1946ac92492d2347c6235b4d2611184

[kamesh@kamesh repos1_wc2]$ /home/kamesh/pure_trunk-neon/bin/svn cat -r2
file:///tmp/repos1/test.c
Hello
[kamesh@kamesh repos1_wc2]$ /home/kamesh/pure_trunk-neon/bin/svn up
At revision 2.
[kamesh@kamesh repos1_wc2]$ /home/kamesh/pure_trunk-neon/bin/svn cat -r2
file:///tmp/repos1/test.c
Hello <--- in the repo
[kamesh@kamesh repos1_wc2]$ /home/kamesh/pure_trunk-neon/bin/svn di test.c
[kamesh@kamesh repos1_wc2]$ cat test.c
hello <---see what pristine copy of failed update resulted in

With regards
Kamesh Jayachandran

---------------------------------------------------------------------
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:58:55 2007

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