mercurial/phases.py
branchstable
changeset 16051 2aa5b51f310f
parent 16030 308406677e9d
child 16293 bc1d949261c4
equal deleted inserted replaced
16050:aaaa7ebc578b 16051:2aa5b51f310f
   237         newphase = abs(int(newphasestr)) # let's avoid negative index surprise
   237         newphase = abs(int(newphasestr)) # let's avoid negative index surprise
   238         oldphase = abs(int(oldphasestr)) # let's avoid negative index surprise
   238         oldphase = abs(int(oldphasestr)) # let's avoid negative index surprise
   239         if currentphase == oldphase and newphase < oldphase:
   239         if currentphase == oldphase and newphase < oldphase:
   240             advanceboundary(repo, newphase, [bin(nhex)])
   240             advanceboundary(repo, newphase, [bin(nhex)])
   241             return 1
   241             return 1
       
   242         elif currentphase == newphase:
       
   243             # raced, but got correct result
       
   244             return 1
   242         else:
   245         else:
   243             return 0
   246             return 0
   244     finally:
   247     finally:
   245         lock.release()
   248         lock.release()
   246 
   249