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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
images
|
3638.6.28 | 16 years ago | Dmitry Vasiliev | Initial version of Russian user guide |
|
||
branching_a_project.txt |
3638.6.31 | 16 years ago | Dmitry Vasiliev | Added Russian translation for part 1.2 of the user | 4.1 KB |
|
|
|
core_concepts.txt |
3638.6.38 | 16 years ago | Alexey Shtokalo | * изменен способ рисования плашек в карточке быстр | 7.4 KB |
|
|
|
index.txt |
3638.6.31 | 16 years ago | Dmitry Vasiliev | Added Russian translation for part 1.2 of the user | 3.9 KB |
|
|
|
introducing_bazaar.txt |
3638.6.31 | 16 years ago | Dmitry Vasiliev | Added Russian translation for part 1.2 of the user | 11.9 KB |
|
|
|
specifying_revisions.txt |
3638.6.31 | 16 years ago | Dmitry Vasiliev | Added Russian translation for part 1.2 of the user | 4.5 KB |
|
|
|
stacked.txt |
3638.6.38 | 16 years ago | Alexey Shtokalo | * изменен способ рисования плашек в карточке быстр | 4.6 KB |
|
|
|
using_checkouts.txt |
3638.6.31 | 16 years ago | Dmitry Vasiliev | Added Russian translation for part 1.2 of the user | 3.6 KB |
|
|
|
zen.txt |
3638.6.39 | 16 years ago | Alexey Shtokalo | Updated Russian translation for zen.txt | 8.6 KB |
|
|