"Julian Foad" wrote
> >>From: Ben Collins-Sussman [mailto:sussman@red-bean.com]
> >>I'm suggesting that the UI be something like this:
> >>
> >> $ svn update hijacked-file.c
> >> WARNING: you have changed this file without locking it, which is
bad!
> >> WARNING: a newer version of the file has been saved in
'hijacked-file-backup.c'
> >> WARNING: please examine the newer file before committing your own
changes!
>
> One problem with a warning is that it can easily whizz past in screens
> full of update messages, and be unnoticed or forgotten.
This used to happen in TSVN - the window scrolls so the warnings go out
of sight. It was solved by appending a warning to the end. Of course if
you can't scroll your window back, then it may not help, but it could
suggest running the appropriate status command to list the conflicted
files.
In case the command is run from a script, I guess the exit status should
also reflect the fact that conflicts occurred, even if it is not an
error.
Simon
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 14 17:41:42 2004