Hi,
The attached patch adds a test case for issue #3471:svn up touches file
w/ lock & svn:keywords property and marking it as 'XFail' until the
issue is fixed.
[[[
Log:
Add a test for issue #3471:'svn up touches file w/ lock &
svn:keywords property'
* subversion/tests/cmdline/update_tests.py
(update_with_file_lock_and_keywords_property_set): New test case.
(test_list): Add update_with_file_lock_and_keywords_property_set and
mark it as XFail.
Patch by: Vijayaguru G <vi...@collab.net>
]]]
Thanks & Regards,
Vijayaguru
Index: subversion/tests/cmdline/update_tests.py
===================================================================
--- subversion/tests/cmdline/update_tests.py (revision 993600)
+++ subversion/tests/cmdline/update_tests.py (working copy)
@@ -5720,7 +5720,31 @@
svntest.actions.run_and_verify_update(wc_dir, expected_output,
expected_disk, expected_status)
+#----------------------------------------------------------------------
+# Test for issue #3471 'svn up touches file w/ lock & svn:keywords property'
+#
+# Marked as XFail until that issue is fixed.
+def update_with_file_lock_and_keywords_property_set(sbox):
+ """update with file lock & keywords property set"""
+ sbox.build()
+
+ wc_dir = sbox.wc_dir
+ mu_path = os.path.join(wc_dir, 'A', 'mu')
+ svntest.main.file_append(mu_path, '$Id$')
+ svntest.main.run_svn(None, 'ps', 'svn:keywords', 'Id', mu_path)
+ svntest.main.run_svn(None, 'lock', mu_path)
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.tweak('A/mu',
+ contents=expected_disk.desc['A/mu'].contents + '$Id$')
+ # Issue #3471 manifests itself here; The timestamp of 'mu' gets updated to the time of the last "svn up".
+ svntest.actions.run_and_verify_update(wc_dir,
+ None,
+ expected_disk,
+ None)
+
+
+
#######################################################################
# Run the tests
@@ -5792,6 +5816,7 @@
add_moved_file_has_props,
XFail(add_moved_file_has_props2),
update_with_excluded_subdir,
+ XFail(update_with_file_lock_and_keywords_property_set)
]
if __name__ == '__main__':
