To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- 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.
--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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.8 KB |
|
|
|
test_branch.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.5 KB |
|
|
|
test_cat.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 2 KB |
|
|
|
test_checkout.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.4 KB |
|
|
|
test_commit.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 2.5 KB |
|
|
|
test_init.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.2 KB |
|
|
|
test_init_repository.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.3 KB |
|
|
|
test_merge.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.4 KB |
|
|
|
test_missing.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.4 KB |
|
|
|
test_pull.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 2 KB |
|
|
|
test_push.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.6 KB |
|
|
|
test_update.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.4 KB |
|
|