Hi all,
When I try to create the diff generated by svn diff, it was failed.
The error message is as below:
Diff Parse Exception: Expected a hunk header, like 'Index: /path/to/file.ext' (svn), 'Property changes on: /path/to/file.ext' (svn properties), 'commit 59bcc3ad6775562f845953cf01624225' (git show), 'diff --git' (git diff), '--- filename' (unified diff), or 'diff -r' (hg diff or patch).
19 + //测试一下
20 ddd();
21 }
22 yyy(loadComplete, 5);
23
>>> 24 ___________________________________________________________________
25 已修改: svn:mergeinfo
26 已经合并 /ggg/ttt/trunk/src/http/service.py:r105126-105449
It seems that the lines begin with ____ are not accepted.
But the file was indeed generated by the 'svn diff' command.
Is it a bug?
The sample diff file is like this:
Index: templates/index.html.tpl
===================================================================
--- templates/index.html.tpl (revision 105169)
+++ templates/index.html.tpl (working copy)
@@ -2,6 +2,7 @@
{% block initjs %}
<script>
+ //我又改了一行
var aaa = {
'全国': '全国',
'北京市': '北京',
@@ -661,8 +662,7 @@
xxx(operator);
bbb.ccc();
});
-
- //ddd
+ //测试一下
ddd();
}
yyy(loadComplete, 5);
___________________________________________________________________
已修改: svn:mergeinfo
已经合并 /ggg/ttt/trunk/src/http/service.py:r105126-105449