Mercurial > hg-stable

changeset 25909:e62839741aaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
files hgext/histedit.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)