~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4634.156.1.

  • Committer: Vincent Ladeuil
  • Date: 2010-07-13 10:21:19 UTC
  • mto: (4634.151.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 5345.
  • Revision ID: v.ladeuil+lp@free.fr-20100713102119-apt5ee1kf6lj6i7y
Don't traceback when unversioning a directory.

* bzrlib/tests/test_workingtree_4.py:
(TestInventoryCoherency.test_inventory_is_synced_when_unversioning_a_dir):
Reproduce bug #494221 where we try to unversion a children even if
the remove_recursive_id for the parent has already done it.

* bzrlib/workingtree_4.py:
(DirStateWorkingTree.unversion): Don't try to unversion an entry
that is not present.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: