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/23 17:40:10 UTC

svn propchange: r1437543 - svn:log

Author: rhuijben
Revision: 1437543
Modified property: svn:log

Modified: svn:log at Wed Jan 23 16:40:10 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Jan 23 16:40:10 2013
@@ -1,10 +1,18 @@
-Update the expected results of the issue #3362 diff test to match the
-future output.
+Resolve issue #3362, by making the memory diff produce previously invisible
+context in unified diffs.
 
-The original data before this patch was what the memory diff produced, and
-the test failed because it was different than the file based diff.
+The memory diff skipped the first line of the diff if it was only
+used for context by other changes.
+
+This patch switches the processing of lines in the memory diff to a similar
+system as the file based unified diff.
 
 * subversion/libsvn_diff/diff_memory.c
-  (two_way_issue_3362_v1,
-   two_way_issue_3362_v2): Update expected results to make these tests fail
-     for the right reason.
+  (unified_output_e): Add skip output type.
+  (unified_output_baton_t): Track current token per source.
+  (output_unified_token_range): Output until a specified token instead of
+    an explicit range, to make things easier for callers.
+  (output_unified_flush_hunk): Use local temporary variables for processing.
+    Update caller.
+  (output_unified_diff_modified): Use the documented calculations from the
+    file based unified diff producer here too.