branch | stable |
changeset 16650 | fcb97d9a26cd |
parent 16524 | ed6a74312176 |
child 16662 | ea7bf1d49bce |
child 16813 | 6d42c797ca6e |
--- a/mercurial/patch.py Fri May 11 22:48:19 2012 -0700 +++ b/mercurial/patch.py Sat May 12 16:10:01 2012 +0900 @@ -1014,9 +1014,9 @@ oldstart = self.starta + top newstart = self.startb + top # zero length hunk ranges already have their start decremented - if self.lena: + if self.lena and oldstart > 0: oldstart -= 1 - if self.lenb: + if self.lenb and newstart > 0: newstart -= 1 return old, oldstart, new, newstart