Author: stsp
Date: Sun Jan 3 23:04:54 2010
New Revision: 895504
URL: http://svn.apache.org/viewvc?rev=895504&view=rev
Log:
* subversion/libsvn_diff/parse-diff.c
(parse_next_hunk): While reading lines from the patch file, do the check
for whether the current line is a comment a tiny bit later.
Now the current line offset is updated for comments, too.
Modified:
subversion/trunk/subversion/libsvn_diff/parse-diff.c
Modified: subversion/trunk/subversion/libsvn_diff/parse-diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/parse-diff.c?rev=895504&r1=895503&r2=895504&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/parse-diff.c Sun Jan 3 23:04:54
2010
@@ -252,11 +252,6 @@
SVN_ERR(svn_stream_readline_detect_eol(stream, &line, NULL, &eof,
iterpool));
- /* Lines starting with a backslash are comments, such as
- * "\ No newline at end of file". */
- if (line->data[0] == '\\')
- continue;
-
if (! eof)
{
/* Update line offset for next iteration.
@@ -265,6 +260,11 @@
SVN_ERR(svn_io_file_seek(patch->patch_file, APR_CUR, &pos,
iterpool));
}
+ /* Lines starting with a backslash are comments, such as
+ * "\ No newline at end of file". */
+ if (line->data[0] == '\\')
+ continue;
+
if (in_hunk)
{
char c;
