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 11:40:06 UTC
svn commit: r1538928 -
/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Author: rhuijben
Date: Tue Nov 5 10:40:06 2013
New Revision: 1538928
URL: http://svn.apache.org/r1538928
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
(movedhere_extract_retract): In preparation for the fix, fix expected result.
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=1538928&r1=1538927&r2=1538928&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 10:40:06 2013
@@ -9250,7 +9250,7 @@ movedhere_extract_retract(const svn_test
{1, "A/E3", "base-deleted", NO_COPY_FROM},
{1, "B2", "normal", 2, "A/B2", MOVED_HERE, "k"},
- {1, "C2", "normal", 1, "A/C2", MOVED_HERE},
+ {1, "C2", "normal", 1, "A/C2"},
{1, "D2", "normal", 1, "A/D2", MOVED_HERE},
{1, "Z", "normal", 2, "A", MOVED_HERE},
@@ -9265,9 +9265,6 @@ movedhere_extract_retract(const svn_test
{1, "Z/E3", "normal", 2, "A/E3", MOVED_HERE},
{2, "Z/B2", "normal", NO_COPY_FROM, "B2"},
- /* ### Z/C2 still contains move information, but there is no
- ### layer below it that is moved.
- ### And there is no tree conflict left */
{2, "Z/C2", "normal", NO_COPY_FROM},
{2, "Z/D2", "normal", NO_COPY_FROM, "D2"},
{2, "Z/E2", "normal", NO_COPY_FROM},