To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Vincent Ladeuil
- Date: 2009-09-08 16:42:51 UTC
- mto: (4681.1.1 integration)
- Revision ID: v.ladeuil+lp@free.fr-20090908164251-8lskfhs8f9aclnnp
Don't allow merge on top of pending merges without --force.
* bzrlib/tests/blackbox/test_merge.py:
(TestMergeForce.test_merge_force,
TestMergeForce.test_merge_with_uncommitted_changes,
TestMergeForce): Complete tests around --force including pending
merges.
* bzrlib/builtins.py:
(cmd_merge.run): Check pending merges too.
* bzrlib/tests/blackbox/test_merge.py:
(TestMergeForce.test_merge_force,
TestMergeForce.test_merge_with_uncommitted_changes,
TestMergeForce): Complete tests around --force including pending
merges.
* bzrlib/builtins.py:
(cmd_merge.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 | 766 bytes |
|
|
|
groupcompress_repo.py |
4634.20.1 | 16 years ago | Robert Collins | Fix bug 402652 by recompressing all texts that are | 52.7 KB |
|
|
|
knitrepo.py |
4608.1.6 | 16 years ago | Martin Pool | Remove redundant overrides of check_conversion_tar | 18.7 KB |
|
|
|
pack_repo.py |
4608.1.6 | 16 years ago | Martin Pool | Remove redundant overrides of check_conversion_tar | 116 KB |
|
|
|
weaverepo.py |
4593.5.39 | 16 years ago | John Arbash Meinel | Merge bzr.dev 4624 in preparation for NEWS | 27.1 KB |
|
|