##// END OF EJS Templates
histedit: use revset to check if we need to update during abort...
Pierre-Yves David -
r25908:5e53d214 default
parent child Browse files
Show More
@@ -791,11 +791,9 b' def _histedit(ui, repo, state, *freeargs'
791 os.remove(backupfile)
791 os.remove(backupfile)
792
792
793 # check whether we should update away
793 # check whether we should update away
794 parentnodes = [c.node() for c in repo[None].parents()]
794 if repo.unfiltered().revs('parents() and (%n or %ln)',
795 for n in leafs | set([state.parentctxnode]):
795 state.parentctxnode, leafs):
796 if n in parentnodes:
796 hg.clean(repo, state.topmost)
797 hg.clean(repo, state.topmost)
798 break
799 cleanupnode(ui, repo, 'created', tmpnodes)
797 cleanupnode(ui, repo, 'created', tmpnodes)
800 cleanupnode(ui, repo, 'temp', leafs)
798 cleanupnode(ui, repo, 'temp', leafs)
801 state.clear()
799 state.clear()
General Comments 0
You need to be logged in to leave comments. Login now