You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/03/05 13:27:52 UTC
svn commit: r1452766 -
/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Author: philip
Date: Tue Mar 5 12:27:51 2013
New Revision: 1452766
URL: http://svn.apache.org/r1452766
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
(move_away_delete_update): No need for resolve, only update is necessary.
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=1452766&r1=1452765&r2=1452766&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Tue Mar 5 12:27:51 2013
@@ -6749,12 +6749,10 @@ move_away_delete_update(const svn_test_o
SVN_ERR(sbox_wc_update(&b, "", 1));
SVN_ERR(sbox_wc_move(&b, "A/B/C", "C2"));
SVN_ERR(sbox_wc_move(&b, "P/Q", "Q2"));
+
+ /* Update to r2 removes the move sources and clears moved_here from
+ the move destinations. */
SVN_ERR(sbox_wc_update(&b, "", 2));
- SVN_ERR(sbox_wc_resolve(&b, "A/B", svn_depth_empty,
- svn_wc_conflict_choose_merged));
- SVN_ERR(sbox_wc_resolve(&b, "P/Q", svn_depth_empty,
- svn_wc_conflict_choose_merged));
- /* Either update or resolve should clear the moved-here flags */
{
nodes_row_t nodes[] = {
{0, "", "normal", 2, ""},