Mercurial > public > mercurial-scm > hg-stable

diff mercurial/crecord.py @ 37875:03350f5234a4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
crecord: fix line number in hunk header (issue5917) `@@ -1,1 +-1,0 @@` is not a valid patch hunk header. Change it to `@@ -1,1 +0,0 @@`. Differential Revision: https://phab.mercurial-scm.org/D3737
author Jun Wu <quark@fb.com>
date Thu, 14 Jun 2018 14:04:26 -0700
parents f0b6fbea00cf
children 00368bc0a614
line wrap: on
line diff
--- a/mercurial/crecord.py	Wed Jun 13 10:41:20 2018 -0400
+++ b/mercurial/crecord.py	Thu Jun 14 14:04:26 2018 -0700
@@ -398,7 +398,7 @@
         if fromline != 0:
             if fromlen == 0:
                 fromline -= 1
-            if tolen == 0:
+            if tolen == 0 and toline > 0:
                 toline -= 1
 
         fromtoline = '@@ -%d,%d +%d,%d @@%s\n' % (