You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/11/05 23:18:15 UTC
svn commit: r1539165 -
/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Author: rhuijben
Date: Tue Nov 5 22:18:14 2013
New Revision: 1539165
URL: http://svn.apache.org/r1539165
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
(move4_update_delself_AAA): Following up on r1539135, use /* comments */
to fix compilation on some compilers.
Modified:
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1539165&r1=1539164&r2=1539165&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Tue Nov 5 22:18:14 2013
@@ -9194,7 +9194,7 @@ move4_update_delself_AAA(const svn_test_
svn_wc_conflict_choose_merged));
SVN_ERR(sbox_wc_resolve(&b, "A_moved/A/A", svn_depth_empty,
svn_wc_conflict_choose_merged));
- //SVN_ERR(check_db_conflicts(&b, "", NULL));
+ /*SVN_ERR(check_db_conflicts(&b, "", NULL));*/
SVN_ERR(sbox_wc_resolve(&b, "A/A", svn_depth_empty,
svn_wc_conflict_choose_mine_conflict));
SVN_ERR(sbox_wc_resolve(&b, "BA_moved/A", svn_depth_empty,