svn commit: r943304 - /subversion/trunk/subversion/tests/cmdline/svntest/wc.py

[gs...@apache.org]

Author: gstein
Date: Tue May 11 21:40:34 2010
New Revision: 943304

URL: http://svn.apache.org/viewvc?rev=943304&view=rev
Log:
The test suite should "see" obstructions in 'svn status' output.

* subversion/tests/cmdline/svntest/wc.py:
  (_re_parse_status): add the obstruction flag to the regex
  (State.tweak_for_entries_compare): omit obstruction markers from the
    expected value since entries-based trees won't have it. add a comment
    on the .entry_rev trickery.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/wc.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=943304&r1=943303&r2=943304&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Tue May 11 21:40:34 2010
@@ -73,7 +73,7 @@ import svntest
 # Working revision, last-changed revision, and last author are whitespace
 # only if the item is missing.
 #
-_re_parse_status = re.compile('^([?!MACDRUG_ ][MACDRUG_ ])'
+_re_parse_status = re.compile('^([?!MACDRUGI_~ ][MACDRUG_ ])'
                               '([L ])'
                               '([+ ])'
                               '([SX ])'
@@ -312,11 +312,14 @@ class State:
         else:
           # when reading the entry structures, we don't examine for text or
           # property mods, so clear those flags. we also do not examine the
-          # filesystem, so we cannot detect missing files.
-          if item.status[0] in 'M!':
+          # filesystem, so we cannot detect missing or obstructed files.
+          if item.status[0] in 'M!~':
             item.status = ' ' + item.status[1]
           if item.status[1] == 'M':
             item.status = item.status[0] + ' '
+          # under wc-ng terms, we may report a different revision than the
+          # backwards-compatible code should report. if there is a special
+          # value for compatibility, then use it.
           if item.entry_rev is not None:
             item.wc_rev = item.entry_rev
             item.entry_rev = None