Author: cmpilato
Date: Fri Jun 29 19:49:19 2012
New Revision: 1355536
URL: http://svn.apache.org/viewvc?rev=1355536&view=rev
Log:
* subversion/tests/libsvn_wc
Add 'conflict-data-test' to svn:ignores.
* subversion/tests/libsvn_wc/conflict-data-test.c
(test_serialize_prop_conflict): Remove unused variable 'old'.
Modified:
subversion/trunk/subversion/tests/libsvn_wc/ (props changed)
subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
Propchange: subversion/trunk/subversion/tests/libsvn_wc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jun 29 19:49:19 2012
@@ -1,12 +1,13 @@
-tree-conflict-data-test
-.libs
*.lo
+.libs
+conflict-data-test
db-test
+entries-compat-test
fake-wc
+op-depth-test
pristine-store-test
svn-test-work
-entries-compat-test
-op-depth-test
-wc-lock-tester
+tree-conflict-data-test
wc-incomplete-tester
+wc-lock-tester
wc-queries-test
Modified: subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c?rev=1355536&r1=1355535&r2=1355536&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c Fri Jun 29
19:49:19 2012
@@ -311,7 +311,6 @@ test_serialize_prop_conflict(const svn_t
SVN_TEST_ASSERT(!complete); /* Nothing set */
{
- apr_hash_t *old = apr_hash_make(pool);
apr_hash_t *mine = apr_hash_make(pool);
apr_hash_t *their_old = apr_hash_make(pool);
apr_hash_t *theirs = apr_hash_make(pool);
