##// END OF EJS Templates
histedit: don't recreate state object...
Durham Goode -
r24131:a2d869e2 default
parent child Browse files
Show More
@@ -599,11 +599,9 b' def _histedit(ui, repo, state, *freeargs'
599
599
600 # rebuild state
600 # rebuild state
601 if goal == 'continue':
601 if goal == 'continue':
602 state = histeditstate(repo)
603 state.read()
602 state.read()
604 state = bootstrapcontinue(ui, state, opts)
603 state = bootstrapcontinue(ui, state, opts)
605 elif goal == 'abort':
604 elif goal == 'abort':
606 state = histeditstate(repo)
607 state.read()
605 state.read()
608 mapping, tmpnodes, leafs, _ntm = processreplacement(state)
606 mapping, tmpnodes, leafs, _ntm = processreplacement(state)
609 ui.debug('restore wc to old parent %s\n' % node.short(state.topmost))
607 ui.debug('restore wc to old parent %s\n' % node.short(state.topmost))
General Comments 0
You need to be logged in to leave comments. Login now