tests/test-context.py.out
author Martin von Zweigbergk <martinvonz@google.com>
Tue, 09 Dec 2014 14:18:31 -0800
changeset 23525 5126d7718d7c
parent 22914 c95db3208a33
child 23700 a4958cdb2202
permissions -rw-r--r--
merge: move dr/rd warning messages out of applyupdates() As preparation for making 'dr' and 'rd' actions no longer actions, move the reporting from applyupdates() to its caller update(). This way we won't have to pass additonal arguments to applyupdates() when they are no longer actions. Also, the warnings are equally unrelated to applyupdates() as they are to recordupdates(), as they don't result in any changes to either the working copy or the dirstate. See earlier patch for additional motivation.

workingfilectx.date = (1000, 0)
ASCII   : Gr?ezi!
Latin-1 : Grüezi!
UTF-8   : Grüezi!
<status modified=['foo'], added=[], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
diff --git a/foo b/foo

--- a/foo
+++ b/foo
@@ -1,1 +1,2 @@
 foo
+bar