changeset 3623 | 71fbb679e311 |
parent 3622 | 534af64b0107 |
child 3624 | 6756f2a85f5b |
--- a/hgext3rd/evolve/evolvecmd.py Fri Mar 23 17:21:09 2018 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Fri Mar 23 17:46:46 2018 +0530 @@ -245,6 +245,9 @@ tmpctx = repo[tmpid] compat.createmarkers(repo, [(bumped, (tmpctx,))], operation='evolve') + # after rebasing, the changeset against which revert should + # happen should be the new rebased changeset + bumped = tmpctx except MergeFailure: repo.vfs.write('graftstate', bumped.hex() + '\n') repo.ui.write_err(_('evolution failed!\n'))