Commit 40a3dd3d authored by Yuya Nishihara's avatar Yuya Nishihara
Browse files

graft: fix --base value to be saved in state file

'True' just works because it is treated as an integer revision '1' and
only the truthiness of the basectx is important. If multiple source revisions
were supported with --base, the resumed graft operation would go wrong.

--HG--
branch : stable
parent 6d968cd40961
Pipeline #6684 failed with stage
in 31 minutes and 13 seconds
......@@ -3168,7 +3168,7 @@ def _dograft(ui, repo, *revs, **opts):
if opts.get(b'no_commit'):
statedata[b'no_commit'] = True
if opts.get(b'base'):
statedata[b'base'] = True
statedata[b'base'] = opts[b'base']
for pos, ctx in enumerate(repo.set(b"%ld", revs)):
desc = b'%d:%s "%s"' % (
ctx.rev(),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment