svn commit: r1706825 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Mon Oct  5 12:25:11 2015
New Revision: 1706825

URL: http://svn.apache.org/viewvc?rev=1706825&view=rev
Log:
Following up on r1706817, make the diff parser continue parsing other property
changes after an 'svn:mergeinfo' property.

* subversion/libsvn_diff/parse-diff.c
  (parse_next_hunk): Exit the mergeinfo hunk when we find no more mergeinfo.
    This allows finding more property changes.

* subversion/tests/cmdline/patch_tests.py
  (patch_with_mergeinfo): Remove XFail marker.

Modified:
    subversion/trunk/subversion/libsvn_diff/parse-diff.c
    subversion/trunk/subversion/tests/cmdline/patch_tests.py

Modified: subversion/trunk/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/parse-diff.c?rev=1706825&r1=1706824&r2=1706825&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/parse-diff.c Mon Oct  5 12:25:11 2015
@@ -1167,7 +1167,13 @@ parse_next_hunk(svn_diff_hunk_t **hunk,
           SVN_ERR(parse_mergeinfo(&found_mergeinfo, line, *hunk, patch,
                                   result_pool, iterpool));
           if (found_mergeinfo)
-            continue; /* Proceed to the next line in the patch. */
+            continue; /* Proceed to the next line in the svn:mergeinfo hunk. */
+          else
+            {
+              /* Perhaps we can also use original_lines/modified_lines here */
+
+              in_hunk = FALSE; /* On to next property */
+            }
         }
 
       if (in_hunk)

Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1706825&r1=1706824&r2=1706825&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Mon Oct  5 12:25:11 2015
@@ -7351,7 +7351,6 @@ def patch_add_one_line(sbox):
                                        [], True, True,
                                        '--reverse-diff')
 
-@XFail()
 def patch_with_mergeinfo(sbox):
   "patch with mergeinfo"