mercurial/copies.py
changeset 14494 1ffeeb91c55d
parent 13878 a8d13ee0ce68
child 15774 0bd17a4bed88
equal deleted inserted replaced
14493:5cc7905bccc9 14494:1ffeeb91c55d
   132             if f1r is None:
   132             if f1r is None:
   133                 f1 = g1.next()
   133                 f1 = g1.next()
   134             if f2r is None:
   134             if f2r is None:
   135                 f2 = g2.next()
   135                 f2 = g2.next()
   136 
   136 
   137             while 1:
   137             while True:
   138                 f1r, f2r = f1.rev(), f2.rev()
   138                 f1r, f2r = f1.rev(), f2.rev()
   139                 if f1r > f2r:
   139                 if f1r > f2r:
   140                     f1 = g1.next()
   140                     f1 = g1.next()
   141                 elif f2r > f1r:
   141                 elif f2r > f1r:
   142                     f2 = g2.next()
   142                     f2 = g2.next()