##// END OF EJS Templates
rebase: remove unnecessary and incorrect handling of nullid...
Martin von Zweigbergk -
r37396:953db9e0 default
parent child Browse files
Show More
@@ -21,7 +21,6 b' import os'
21
21
22 from mercurial.i18n import _
22 from mercurial.i18n import _
23 from mercurial.node import (
23 from mercurial.node import (
24 nullid,
25 nullrev,
24 nullrev,
26 short,
25 short,
27 )
26 )
@@ -252,7 +251,7 b' class rebaseruntime(object):'
252 else:
251 else:
253 destrev = legacydest
252 destrev = legacydest
254 destmap[oldrev] = destrev
253 destmap[oldrev] = destrev
255 if newrev in (nullid, revtodostr):
254 if newrev == revtodostr:
256 state[oldrev] = revtodo
255 state[oldrev] = revtodo
257 # Legacy compat special case
256 # Legacy compat special case
258 else:
257 else:
General Comments 0
You need to be logged in to leave comments. Login now