[issue539] update & keep-removed-file leaves file non-re-removable

[dns]

New submission from dns <dns at somacoma.net>:

i can only replay the state where i got here from memory. state is as follows:

$ hg status .
R geodata.cgi

$ hg ci geodata.cgi
* unknown exception encountered, details follow
** report bug details to http://www.selenic.com/mercurial/bts
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 0.9.3)
Traceback (most recent call last):
  File "/usr/bin/hg", line 12, in <module>
    commands.run()
  File "/var/lib/python-support/python2.5/mercurial/commands.py", line 3000, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/var/lib/python-support/python2.5/mercurial/commands.py", line 3223, in
dispatch
    return d()
  File "/var/lib/python-support/python2.5/mercurial/commands.py", line 3182, in
<lambda>
    d = lambda: func(u, repo, *args, **cmdoptions)
  File "/var/lib/python-support/python2.5/mercurial/commands.py", line 454, in
commit
    force_editor=opts.get('force_editor'))
  File "/var/lib/python-support/python2.5/hgext/mq.py", line 2020, in commit
    return super(mqrepo, self).commit(*args, **opts)
  File "/var/lib/python-support/python2.5/mercurial/localrepo.py", line 736, in
commit
    mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0], (new, remove))
  File "/var/lib/python-support/python2.5/mercurial/manifest.py", line 191, in add
    _("failed to remove %s from manifest") % f)
AssertionError: failed to remove htdocs/geodata.cgi from manifest


yuck.

how i approximately got here:
- changed geodata.cgi
- pulled and updated other changes from a diffferent repo
  one of the remote changes was a remove of geodata.cgi
- upon update, was asked whether i would like to keep the file.
- said yes. [incorporated changes elsewhere]
- then: $ hg rm geodata.cgi
- $ hg ci geodata.cgi

big-badaboom.

the repo seems not broken. i could push any other outgoing changes in the
meanwhile. no data loss, i assume that's 'bug' priority?

otoh, it's certainly a major annoyance. my colleague in the next room is a
git-head, i'll have a hard time playing this incident down.

----------
messages: 2995
nosy: dns
priority: bug
status: unread
title: update & keep-removed-file leaves file non-re-removable

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue539>
____________________________________________________