- 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 | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bzrlib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
contrib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
doc
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
man1
|
2425.1.1 | 17 years ago | Robert Collins | ``make docs`` now creates a man page at ``man1/bzr |
|
||
|
tools
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
.bzrignore |
4580.5.3 | 15 years ago | John Arbash Meinel | Change the Makefile to stage things into a build d | 1.2 KB |
|
|
|
.rsyncexclude |
1185.33.36 | 19 years ago | Martin Pool | Exclude more files from dumb-rsync upload | 203 bytes |
|
|
|
BRANCH.TODO |
4325.3.4 | 15 years ago | Johan Walles | Merge from upstream. | 150 bytes |
|
|
bzr |
4596.1.7 | 15 years ago | Martin Pool | Bump version to 2.1 | 5.6 KB |
|
|
|
bzr.ico |
3688.3.3 | 16 years ago | John Arbash Meinel | An updated transparent icon for bzr. | 12.7 KB |
|
|
|
COPYING.txt |
1861.2.9 | 18 years ago | Alexander Belchenko | rename gpl.txt => COPYING.txt | 17.5 KB |
|
|
|
INSTALL |
2696.2.4 | 17 years ago | Aaron Bentley | Fix typo | 1.4 KB |
|
|
|
Makefile |
4655 | 15 years ago | Canonical.com Patch Queue Manager | (mbp) make check no longer repeats the test run in | 12.1 KB |
|
|
|
NEWS |
4665.3.14 | 15 years ago | Robert Collins | Merge bzr.dev. | 383 KB |
|
|
|
profile_imports.py |
4183.7.1 | 15 years ago | Sabin Iacob | update FSF mailing address | 5.5 KB |
|
|
|
README |
3286 | 16 years ago | Canonical.com Patch Queue Manager | Start 1.4 development | 3.3 KB |
|
|
|
setup.py |
4610.1.1 | 15 years ago | Denys Duchier | install keys and certs. fixes bug #392401. | 26.6 KB |
|
|
|
TODO |
2382.2.5 | 17 years ago | Martin Pool | Contents of TODO file moved into bug tracker | 115 bytes |
|
|