Stack trace when commiting (suppress, merge and accept other changes and suppress)
Benoit Boissinot
bboissin at gmail.com
Tue Oct 14 10:29:35 CDT 2008
On Tue, Oct 7, 2008 at 1:49 PM, Mathieu Clabaut
<mathieu.clabaut at gmail.com> wrote:
> Hello,
Hi Mathieu,
> 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 debugstate:
> ...
> r 0 -2 1970-01-01 01:00:00 Limite support mvt sécurisé.bps
[snip]
> 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
Can you open a bug report about this ?
thanks,
Benoit
More information about the Mercurial-devel
mailing list