svn commit: r1441566 - in /subversion/trunk/subversion: libsvn_client/merge.c tests/cmdline/merge_tests.py

[pb...@apache.org]

Author: pburba
Date: Fri Feb  1 18:15:59 2013
New Revision: 1441566

URL: http://svn.apache.org/viewvc?rev=1441566&view=rev
Log:
Fix issue #4310 "each editor drive gets its own notification during
'svn merge'".

* subversion/libsvn_client/merge.c

  (do_file_merge): Reset the merge_b->notified_merge_begin to false after
   each editor drive.

* subversion/tests/cmdline/merge_tests.py

  (multiple_editor_drive_merge_notifications): Remove XFail decorator and
   tweak comments re failure status.


Modified:
    subversion/trunk/subversion/libsvn_client/merge.c
    subversion/trunk/subversion/tests/cmdline/merge_tests.py

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1441566&r1=1441565&r2=1441566&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Feb  1 18:15:59 2013
@@ -7315,6 +7315,9 @@ do_file_merge(svn_mergeinfo_catalog_t re
                                               iterpool));
             }
 
+          /* Ensure any subsequent drives gets their own notification. */
+          merge_b->notified_merge_begin = FALSE;
+
           if ((i < (ranges_to_merge->nelts - 1))
               && is_path_conflicted_by_merge(merge_b))
             {

Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1441566&r1=1441565&r2=1441566&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Feb  1 18:15:59 2013
@@ -18233,7 +18233,6 @@ def conflict_aborted_mergeinfo_described
     ['/iota:2-4\n'], [], 'pg', SVN_PROP_MERGEINFO, iota_copy_path)
 
 @SkipUnless(server_has_mergeinfo)
-@XFail()
 @Issue(4310)
 # Test for issue #4310 "each editor drive gets its own notification
 # during 'svn merge'"
@@ -18288,7 +18287,8 @@ def multiple_editor_drive_merge_notifica
     [], 'merge', sbox.repo_url + '/A/C', C_branch_path)
 
   # Then the file target:
-  # This currently fails because only the first range notification is printed:
+  # Previously this failed because only the first range notification was
+  # printed:
   #
   #   >svn merge ^/iota iota-copy
   #   --- Merging r2 through r4 into 'iota-copy':