svn commit: r1764454 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

[ko...@apache.org]

Author: kotkov
Date: Wed Oct 12 13:02:01 2016
New Revision: 1764454

URL: http://svn.apache.org/viewvc?rev=1764454&view=rev
Log:
* subversion/tests/libsvn_client/conflicts-test.c
  (test_merge_incoming_chained_move_local_edit): Update the comment in
   this test.  The test used to fail, but passes now.

Modified:
    subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1764454&r1=1764453&r2=1764454&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Wed Oct 12 13:02:01 2016
@@ -2919,8 +2919,9 @@ test_merge_incoming_chained_move_local_e
 
   SVN_ERR(svn_client_conflict_tree_get_details(conflict, ctx, pool));
 
-  /* XFAIL: The conflict resolver doesn't find the move, and doesn't offer
-   * the svn_client_conflict_option_incoming_move_file_text_merge option. */
+  /* This used to fail around r1764234. The conflict resolver was
+   * unable to detect the move, and didn't offer the
+   * svn_client_conflict_option_incoming_move_file_text_merge option. */
   {
     svn_client_conflict_option_id_t expected_opts[] = {
       svn_client_conflict_option_postpone,