Show More
@@ -243,7 +243,7 b' class rebaseruntime(object):' | |||||
243 | activebookmark = l |
|
243 | activebookmark = l | |
244 | else: |
|
244 | else: | |
245 | args = l.split(':') |
|
245 | args = l.split(':') | |
246 | oldrev = args[0] |
|
246 | oldrev = repo[args[0]].rev() | |
247 | newrev = args[1] |
|
247 | newrev = args[1] | |
248 | if newrev in legacystates: |
|
248 | if newrev in legacystates: | |
249 | continue |
|
249 | continue | |
@@ -251,12 +251,12 b' class rebaseruntime(object):' | |||||
251 | destrev = repo[args[2]].rev() |
|
251 | destrev = repo[args[2]].rev() | |
252 | else: |
|
252 | else: | |
253 | destrev = legacydest |
|
253 | destrev = legacydest | |
254 |
destmap[ |
|
254 | destmap[oldrev] = destrev | |
255 | if newrev in (nullid, revtodostr): |
|
255 | if newrev in (nullid, revtodostr): | |
256 |
state[ |
|
256 | state[oldrev] = revtodo | |
257 | # Legacy compat special case |
|
257 | # Legacy compat special case | |
258 | else: |
|
258 | else: | |
259 |
state[ |
|
259 | state[oldrev] = repo[newrev].rev() | |
260 |
|
260 | |||
261 | except IOError as err: |
|
261 | except IOError as err: | |
262 | if err.errno != errno.ENOENT: |
|
262 | if err.errno != errno.ENOENT: |
General Comments 0
You need to be logged in to leave comments.
Login now