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/01/26 10:31:51 UTC

svn commit: r1438868 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

Author: rhuijben
Date: Sat Jan 26 09:31:51 2013
New Revision: 1438868

URL: http://svn.apache.org/viewvc?rev=1438868&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
  (no_self_referential_filtering_on_added_path): Update expected result. The
    initial property change (from no local changes) is always reported as 'U'
    instead of 'G'. This makes the real behavior change more visible.

Modified:
    subversion/trunk/subversion/tests/cmdline/merge_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1438868&r1=1438867&r2=1438868&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Sat Jan 26 09:31:51 2013
@@ -13969,7 +13969,7 @@ def no_self_referential_filtering_on_add
     })
   expected_mergeinfo_output = wc.State(A_COPY_2_path, {
     ''        : Item(status=' G'),
-    'C_MOVED' : Item(status=' G', prev_status=' G'),
+    'C_MOVED' : Item(status=' U'),
     })
   expected_elision_output = wc.State(A_COPY_2_path, {
     })