changeset 25910 | b4a85ddadcb9 |
parent 25909 | e62839741aaa |
child 26038 | 7617bc7b0c97 |
--- a/hgext/histedit.py Mon Aug 03 06:11:45 2015 -0700 +++ b/hgext/histedit.py Mon Aug 03 06:13:05 2015 -0700 @@ -791,7 +791,7 @@ os.remove(backupfile) # check whether we should update away - if repo.unfiltered().revs('parents() and (%n or %ln)', + if repo.unfiltered().revs('parents() and (%n or %ln::)', state.parentctxnode, leafs | tmpnodes): hg.clean(repo, state.topmost) cleanupnode(ui, repo, 'created', tmpnodes)