Changeset 573 in tailor

Timestamp:

08/15/05 18:02:20 (8 years ago)

Author:

lele@…

Hash name:

20050815160220-97f81-2bb1eed1fbbb8315b6f4d758f43b2a579fbfe8b4

Message:

Emit a a better and more generic prompt to warn the user about conflict

File:

• vcpx/source.py (modified) (1 diff)

vcpx/source.py

@@ -23 +23 @@
  * %s
 
+This is quite unusual, and most probably it means someone else has
+changed the working dir, beyond tailor control, or maybe a tailor bug
+is showing up.
+
 Either abort the session with Ctrl-C, or manually correct the situation
-with a Ctrl-Z and a few "svn resolved". What would you like to do?
+with a Ctrl-Z, explore and correct, and coming back from the shell with
+'fg'.
+
+What would you like to do?
 """