Author: rhuijben
Date: Wed May 11 02:45:58 2011
New Revision: 1101730
URL: http://svn.apache.org/viewvc?rev=1101730&view=rev
Log:
* subversion/tests/cmdline/revert_tests.py
(revert_reexpand_keyword): Mark XFail until we resolve the contradiction.
Modified:
subversion/trunk/subversion/tests/cmdline/revert_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1101730&r1=1101729&r2=1101730&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Wed May 11
02:45:58 2011
@@ -231,7 +231,28 @@ def revert_from_wc_root(sbox):
svntest.actions.run_and_verify_status('', expected_output)
-
+# I temporarily mark this test XFail as the current implementation
+# (and the one in 1.5/1.6) contain a contradiction.
+#
+# If the recorded timestamp and size match the file (E.g. after 'svn cleanup')
+# then revert won't reinstall the file as the file is 'not modified'
+# when compared in repository normal form.
+#
+# But if there is no recorded information, revert would ask to compare the file
+# in translated form, so it would notice that the file was modified.
+#
+# We should decide:
+# * if we want to perform a full scan (and catch these expansion changes
+# always), at the cost of performing a full scan from revert.
+#
+# * Don't catch these changes (and do nothing). Keep this test broken.
+#
+# * Implement another level of recording 'unmodified'
+# (one for unmodified in translated form and one for normalized or similar).
+#
+# * Or revert r1101473, which removed this contradiction. So this option would
+# would fix the test, but not the real problem.
+@XFail()
@Issue(1663)
def revert_reexpand_keyword(sbox):
"revert reexpands manually contracted keyword"
