##// END OF EJS Templates
rebase: convert "oldrev" to revnum earlier...
Martin von Zweigbergk -
r37395:3dfd7f01 default
parent child Browse files
Show More
@@ -243,7 +243,7 b' class rebaseruntime(object):'
243 243 activebookmark = l
244 244 else:
245 245 args = l.split(':')
246 oldrev = args[0]
246 oldrev = repo[args[0]].rev()
247 247 newrev = args[1]
248 248 if newrev in legacystates:
249 249 continue
@@ -251,12 +251,12 b' class rebaseruntime(object):'
251 251 destrev = repo[args[2]].rev()
252 252 else:
253 253 destrev = legacydest
254 destmap[repo[oldrev].rev()] = destrev
254 destmap[oldrev] = destrev
255 255 if newrev in (nullid, revtodostr):
256 state[repo[oldrev].rev()] = revtodo
256 state[oldrev] = revtodo
257 257 # Legacy compat special case
258 258 else:
259 state[repo[oldrev].rev()] = repo[newrev].rev()
259 state[oldrev] = repo[newrev].rev()
260 260
261 261 except IOError as err:
262 262 if err.errno != errno.ENOENT:
General Comments 0
You need to be logged in to leave comments. Login now