svn commit: r1040221 - /subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c

[hw...@apache.org]

Author: hwright
Date: Mon Nov 29 18:34:30 2010
New Revision: 1040221

URL: http://svn.apache.org/viewvc?rev=1040221&view=rev
Log:
Although this doesn't actually affect any test failures, make the
entries-compat-test schema comply with reality by putting conflict data in
the right columns on the correct nodes.  (This is similar to what r1040210 did
for db-test.)

* subversion/tests/libsvn_wc/entries-compat.c
  (I_TC_DATA): Remove.
  (F_TC_DATA, G_TC_DATA): New.
  (TESTING_DATA): Move the conflict data to the correct columns/nodes.

Modified:
    subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c

Modified: subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c?rev=1040221&r1=1040220&r2=1040221&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c Mon Nov 29 18:34:30 2010
@@ -75,7 +75,8 @@
 #define MD5_1 "2d18c5e57e84c5b8a5e9a6e13fa394dc"
 #define MD5_2 "5d41402abc4b2a76b9719d911017c592"
 
-#define I_TC_DATA "((conflict F file update edited deleted (version 22 " ROOT_ONE " 1 2 branch1/ft/F none) (version 22 " ROOT_ONE " 1 3 branch1/ft/F file)) (conflict G file update edited deleted (version 22 " ROOT_ONE " 1 2 branch1/ft/F none) (version 22 " ROOT_ONE " 1 3 branch1/ft/F file)) )"
+#define F_TC_DATA "(conflict F file update edited deleted (version 22 " ROOT_ONE " 1 2 branch1/ft/F none) (version 22 " ROOT_ONE " 1 3 branch1/ft/F file))"
+#define G_TC_DATA "(conflict G file update edited deleted (version 22 " ROOT_ONE " 1 2 branch1/ft/F none) (version 22 " ROOT_ONE " 1 3 branch1/ft/F file))"
 
 static const char * const TESTING_DATA = (
    /* Load our test data.
@@ -262,7 +263,13 @@ static const char * const TESTING_DATA =
   "  null, null, null, null);"
    "insert into actual_node values ("
    "  1, 'I', '', null, null, null, null, null, 'changelist', null, "
-   "'" I_TC_DATA "', null, null, null, null);"
+   "  null, null, null, null, null);"
+   "insert into actual_node values ("
+   "  1, 'F', '', null, null, null, null, null, null, null, "
+   "  null, '" F_TC_DATA "', null, null, null);"
+   "insert into actual_node values ("
+   "  1, 'G', '', null, null, null, null, null, null, null, "
+   "  null, '" G_TC_DATA "', null, null, null);"
    "  "
    "insert into nodes values ("
    "  1, 'M', 0, '', 1, 'M', 1, 'normal', "