Mercurial > hg
comparison hgext/histedit.py @ 25909:e62839741aaa
histedit: also update away from tmpnodes
The working copy may be on a tmpnodes, we need to update away before it is
stripped from the repository.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Mon, 03 Aug 2015 06:11:45 -0700 |
parents | 5e53d214415d |
children | b4a85ddadcb9 |
comparison
equal
deleted
inserted
replaced
25908:5e53d214415d | 25909:e62839741aaa |
---|---|
790 'bundle:' + backupfile) | 790 'bundle:' + backupfile) |
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 if repo.unfiltered().revs('parents() and (%n or %ln)', | 794 if repo.unfiltered().revs('parents() and (%n or %ln)', |
795 state.parentctxnode, leafs): | 795 state.parentctxnode, leafs | tmpnodes): |
796 hg.clean(repo, state.topmost) | 796 hg.clean(repo, state.topmost) |
797 cleanupnode(ui, repo, 'created', tmpnodes) | 797 cleanupnode(ui, repo, 'created', tmpnodes) |
798 cleanupnode(ui, repo, 'temp', leafs) | 798 cleanupnode(ui, repo, 'temp', leafs) |
799 state.clear() | 799 state.clear() |
800 return | 800 return |