Changeset 1361 in tailor

Timestamp:

04/24/07 20:08:14 (6 years ago)

Author:

zooko@…

Hash name:

20070424180814-92b7f-e8ff6b901991114706239d42ffead3a8bfcbac6c

Message:

fix in-code comments -- conflicts can happen with normal operation (for darcs sources)

File:

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

vcpx/source.py

@@ -125 +125 @@
 
                 if res:
-                    # Uh, we have a conflict: this should not ever
-                    # happen, but the user may have manually tweaked
-                    # the working directory. Give her a chance of
-                    # fixing the situation, or abort with Ctrl-C, or
-                    # whatever the subclasses decide.
+                    # We have a conflict.  Give the user a chance of fixing 
+                    # the situation, or abort with Ctrl-C, or whatever the 
+                    # subclasses decide.
                     try:
                         self._handleConflict(c, conflicts, res)