~vila/bzr/426344-check-pending-merges

Viewing all changes in revision 4675.

  • Committer: Vincent Ladeuil
  • Date: 2009-09-08 16:45:11 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20090908164511-5e7eupewxycwaue4
Don't allow remove-tree to succeed with pending merges unless
--force is used.

* bzrlib/tests/blackbox/test_remove_tree.py:
(TestRemoveTree.test_remove_tree_pending_merges,
TestRemoveTree.test_remove_tree_pending_merges_force): Test with
and without --force and pending merges.

* bzrlib/builtins.py:
(cmd_remove_tree.run): Check pending merges too.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: