branch | stable |
changeset 10730 | 4d6bd7b8b6d8 |
parent 10691 | a778a367c20b |
child 10731 | 71cf11f03b3d |
child 10755 | 32023a0a389b |
--- a/hgext/mq.py Thu Mar 18 18:22:34 2010 +0100 +++ b/hgext/mq.py Thu Mar 18 19:26:56 2010 +0100 @@ -96,13 +96,11 @@ for line in file(pf): line = line.rstrip() - if line.startswith('diff --git'): + if (line.startswith('diff --git') + or (diffstart and line.startswith('+++ '))): diffstart = 2 break - if diffstart: - if line.startswith('+++ '): - diffstart = 2 - break + diffstart = 0 # reset if line.startswith("--- "): diffstart = 1 continue