svn propchange: r1600096 - svn:log

[st...@apache.org]

Author: stsp
Revision: 1600096
Modified property: svn:log

Modified: svn:log at Wed Jun  4 14:28:58 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Jun  4 14:28:58 2014
@@ -16,3 +16,16 @@ A grumpier type of SVN developer might e
 is far from useful in the context of 'svn patch'. However, making the
 diff parser return mergeinfo data should not contradict this notion,
 nor should it make future research into perfect patch strategies impossible.
+
+* subversion/include/svn_diff.h
+  (svn_patch_t): Add mergeinfo and reverse_mergeinfo fields.
+ 
+* subversion/libsvn_diff/parse-diff.c
+  (): Include svn_ctype.h and svn_mergeinfo.h.
+  (parse_mergeinfo): New helper function which parses one
+   pretty-printed line of mergeinfo from svn diff output.
+  (parse_next_hunk): Parse svn:mergeinfo properties with the
+   new parse_mergeinfo() helper.
+  (parse_hunks): When an svn:mergeinfo property has been parsed,
+   do not add a hunk for it. Mergeinfo is stored inside the svn_patch_t
+   data structure.