[issue1878] remote changed dir/subdir/file which local deleted

[asdqwe]

New submission from asdqwe <asdwqe11 at mailinator.com>:

$ hg ci
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 1.1.2)
** Extensions loaded:
Traceback (most recent call last):
  File "/usr/bin/hg", line 20, in <module>
    mercurial.dispatch.run()
  File "/var/lib/python-support/python2.6/mercurial/dispatch.py", line 20,
in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/var/lib/python-support/python2.6/mercurial/dispatch.py", line 29,
in dispatch
    return _runcatch(u, args)
  File "/var/lib/python-support/python2.6/mercurial/dispatch.py", line 45,
in _runcatch
    return _dispatch(ui, args)
  File "/var/lib/python-support/python2.6/mercurial/dispatch.py", line 367,
in _dispatch
    ret = _runcommand(ui, options, cmd, d)
  File "/var/lib/python-support/python2.6/mercurial/dispatch.py", line 416,
in _runcommand
    return checkargs()
  File "/var/lib/python-support/python2.6/mercurial/dispatch.py", line 376,
in checkargs
    return cmdfunc()
  File "/var/lib/python-support/python2.6/mercurial/dispatch.py", line 361,
in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/var/lib/python-support/python2.6/mercurial/util.py", line 715, in check
    return func(*args, **kwargs)
  File "/var/lib/python-support/python2.6/mercurial/commands.py", line 617,
in commit
    node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
  File "/var/lib/python-support/python2.6/mercurial/cmdutil.py", line 1189,
in commit
    return commitfunc(ui, repo, message, m, opts)
  File "/var/lib/python-support/python2.6/mercurial/commands.py", line 615,
in commitfunc
    match, force_editor=opts.get('force_editor'))
  File "/var/lib/python-support/python2.6/mercurial/localrepo.py", line 794,
in commit
    use_dirstate, update_dirstate)
  File "/var/lib/python-support/python2.6/mercurial/localrepo.py", line 894,
in _commitctx
    (new, removed))
  File "/var/lib/python-support/python2.6/mercurial/manifest.py", line 172,
in add
    _("failed to remove %s from manifest") % f)
AssertionError: failed to remove dir/subdir/file from manifest

----------
files: error.log
messages: 10810
nosy: asdqwe
priority: bug
status: unread
title: remote changed dir/subdir/file which local deleted

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue1878>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: error.log
Type: application/octet-stream
Size: 2 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20091020/adf39ded/attachment.obj