[issue1367] Stack trace when commiting (suppress, merge and accept other changes and suppress)
mathieu clabaut
mercurial-bugs at selenic.com
Wed Oct 29 17:30:11 CDT 2008
New submission from mathieu clabaut <mathieu.clabaut at gmail.com>:
Here is the scenario leading to the stack trace (with a hg from crew pulled on
october 7).
I'll try to build a test case.
I suppressed "Limite support mvt sécurisé.bps" from my repo, pull from another
one where the file was changed.
Doing a merge I was asked by mercurial to get changed (c) or removed(r). I
chose (c).
A bit later I removed that file : hg remove "Limite support mvt sécurisé.bps"
hg st gave:
...
R Limite support mvt sécurisé.bps
....
hg verify:
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
115 files, 59 changesets, 477 total revisions
And "Limite support mvt sécurisé.bps" is not in the output of "hg manifest"
hg debugstate:
...
r 0 -2 1970-01-01 01:00:00 Limite support mvt sécurisé.bps
...
When commiting I get the following trace:
$hg commit -m "Merge auto avec thang"
transaction abort!
rollback completed
** unknown exception encountered, details follow
** report bug details to http://www.selenic.com/mercurial/bts
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 34eeb891d227)
Traceback (most recent call last):
File "/usr/bin/hg", line 20, in <module>
mercurial.dispatch.run()
File "/usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 20, in run
sys.exit(dispatch(sys.argv[1:]))
File "/usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 29, in
dispatch
return _runcatch(u, args)
File "/usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 45, in
_runcatch
return _dispatch(ui, args)
File "/usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 364, in
_dispatch
ret = _runcommand(ui, options, cmd, d)
File "/usr/lib/python2.5/site-packages/hgext/pager.py", line 62, in pagecmd
return oldrun(ui, options, cmd, cmdfunc)
File "/usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 417, in
_runcommand
return checkargs()
File "/usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 373, in
checkargs
return cmdfunc()
File "/usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 356, in
<lambda>
d = lambda: func(ui, repo, *args, **cmdoptions)
File "/usr/lib/python2.5/site-packages/mercurial/commands.py", line 568, in commit
node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
File "/usr/lib/python2.5/site-packages/mercurial/cmdutil.py", line 1181, in commit
return commitfunc(ui, repo, message, m, opts)
File "/usr/lib/python2.5/site-packages/mercurial/commands.py", line 566, in
commitfunc
match, force_editor=opts.get('force_editor'))
File "/usr/lib/python2.5/site-packages/hgext/mq.py", line 2260, in commit
return super(mqrepo, self).commit(*args, **opts)
File "/usr/lib/python2.5/site-packages/mercurial/localrepo.py", line 793, in
commit
use_dirstate, update_dirstate)
File "/usr/lib/python2.5/site-packages/mercurial/localrepo.py", line 881, in
_commitctx
(new, removed))
File "/usr/lib/python2.5/site-packages/mercurial/manifest.py", line 169, in add
_("failed to remove %s from manifest") % f)
AssertionError: failed to remove Limite support mvt sécurisé.bps from manifest
----------
messages: 7709
nosy: mathieu.clabaut
priority: bug
status: unread
title: Stack trace when commiting (suppress, merge and accept other changes and suppress)
____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1367>
____________________________________________________
More information about the Mercurial-devel
mailing list