# HG changeset patch # User Pierre-Yves David # Date 1438607505 25200 # Node ID e62839741aaa85516a8b2e99048093a839e519d1 # Parent 5e53d214415d2ccb7e43bdaf6865ea676c827e8c 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. diff -r 5e53d214415d -r e62839741aaa hgext/histedit.py --- a/hgext/histedit.py Mon Aug 03 06:08:37 2015 -0700 +++ b/hgext/histedit.py Mon Aug 03 06:11:45 2015 -0700 @@ -792,7 +792,7 @@ # check whether we should update away if repo.unfiltered().revs('parents() and (%n or %ln)', - state.parentctxnode, leafs): + state.parentctxnode, leafs | tmpnodes): hg.clean(repo, state.topmost) cleanupnode(ui, repo, 'created', tmpnodes) cleanupnode(ui, repo, 'temp', leafs)