- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
admin-guide
|
3183.3.2 | 16 years ago | Matthew Revell | Added an admin-guide directory to doc/en and outli |
|
||
|
developer-guide
|
2691.1.1 | 17 years ago | Ian Clatworthy | move most existing topics into the User Guide dir |
|
||
|
mini-tutorial
|
2691.1.11 | 17 years ago | Ian Clatworthy | Added mini tutorial |
|
||
|
quick-reference
|
2691.1.12 | 17 years ago | Ian Clatworthy | Added Quick Start Summary |
|
||
|
release-notes
|
2691.1.1 | 17 years ago | Ian Clatworthy | move most existing topics into the User Guide dir |
|
||
|
tutorials
|
2977.1.13 | 16 years ago | Ian Clatworthy | more cleanups and creation of tutorials directory |
|
||
|
upgrade-guide
|
4501.3.1 | 15 years ago | Ian Clatworthy | first draft of a 2.0 Upgrade Guide |
|
||
|
user-guide
|
2691.1.1 | 17 years ago | Ian Clatworthy | move most existing topics into the User Guide dir |
|
||
|
user-reference
|
2691.1.1 | 17 years ago | Ian Clatworthy | move most existing topics into the User Guide dir |
|
||