~bzr-pqm/bzr/bzr.dev

  • Committer: Vincent Ladeuil
  • Date: 2009-09-08 16:45:11 UTC
  • mto: (4681.1.1 integration)
  • 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.
Filename Latest Rev Last Changed Committer Comment Size
..
index.html 4619.1.1 15 years ago Ian Clatworthy Add links to latest Migrations Docs and Plugins Gu 2.5 KB Diff Download File
layout.html 4557.3.1 15 years ago Ian Clatworthy Core website & navigation working 209 bytes Diff Download File