@@ -200,23 +200,51 @@
$ hg strip -q -r b5f70786f9b0
$ mv .hg/histedit-state.bak .hg/histedit-state
$ hg histedit --abort
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 3 files
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ warning: encountered an exception during histedit --abort; the repository
may not have been completely cleaned up
+ ** unknown exception encountered, please report by visiting
+ ** https://mercurial-scm.org/wiki/BugTracker
+ ** Python 2.7.9 (default, Mar 1 2015, 12:57:24) [GCC 4.9.2]
+ ** Mercurial Distributed SCM (version 3.5.2+756-e8ff886ba364+20151015)
+ ** Extensions loaded: histedit, strip
+ Traceback (most recent call last):
+ File "/home/pyd/src/mercurial-dev/hg", line 43, in <module>
+ mercurial.dispatch.run()
+ File "/home/pyd/src/mercurial-dev/mercurial/dispatch.py", line 54, in run
+ sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255)
+ File "/home/pyd/src/mercurial-dev/mercurial/dispatch.py", line 116, in
dispatch
+ ret = _runcatch(req)
+ File "/home/pyd/src/mercurial-dev/mercurial/dispatch.py", line 187, in
_runcatch
+ return _dispatch(req)
+ File "/home/pyd/src/mercurial-dev/mercurial/dispatch.py", line 920, in
_dispatch
+ cmdpats, cmdoptions)
+ File "/home/pyd/src/mercurial-dev/mercurial/dispatch.py", line 679, in
runcommand
+ ret = _runcommand(ui, options, cmd, d)
+ File "/home/pyd/src/mercurial-dev/mercurial/dispatch.py", line 1051, in
_runcommand
+ return checkargs()
+ File "/home/pyd/src/mercurial-dev/mercurial/dispatch.py", line 1011, in
checkargs
+ return cmdfunc()
+ File "/home/pyd/src/mercurial-dev/mercurial/dispatch.py", line 917, in
<lambda>
+ d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
+ File "/home/pyd/src/mercurial-dev/mercurial/util.py", line 801, in check
+ return func(*args, **kwargs)
+ File "/home/pyd/src/mercurial-dev/hgext/histedit.py", line 729, in
histedit
+ _histedit(ui, repo, state, *freeargs, **opts)
+ File "/home/pyd/src/mercurial-dev/hgext/histedit.py", line 825, in
_histedit
+ gen.apply(repo, 'histedit', 'bundle:' + backupfile)
+ AttributeError: 'unbundle20' object has no attribute 'apply'
+ [1]
$ hg log -r .
- changeset: 6:b5f70786f9b0
- tag: tip
+ changeset: 3:055a42cdd887
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- summary: f
+ summary: d