Mercurial > public > mercurial-scm > hg-stable

diff mercurial/mdiff.py @ 361:88268aa2b8d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix another sortdiff cornercase -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix another sortdiff cornercase manifest hash: 32b2d1750689c561c9471fb68a9f3571364399cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsL6AywK+sNU5EO8RAhaeAJ4zw18vo4oGTvymplKb7olKEeg0aQCfVxX1 2o/PcrE6EeboHpQn5E0Wb/Y= =eENW -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 15 Jun 2005 15:49:20 -0800
parents 27d08c0c2a7e
children 8f8bb77d560e
line wrap: on
line diff
--- a/mercurial/mdiff.py	Wed Jun 15 13:04:05 2005 -0800
+++ b/mercurial/mdiff.py	Wed Jun 15 15:49:20 2005 -0800
@@ -58,14 +58,14 @@
             yield (am, bm, la - am) # return a match
 
         # skip mismatched lines from b
-        while lb < lenb and b[lb] < a[la]:
+        while la < lena and lb < lenb and b[lb] < a[la]:
             lb += 1
 
         if lb >= lenb:
             break
         
         # skip mismatched lines from a
-        while la < lena and b[lb] > a[la]:
+        while la < lena and lb < lenb and b[lb] > a[la]:
             la += 1
 
         if la >= lena: