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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
serializer
|
1185.82.3 | 20 years ago | John Arbash Meinel | Working on creating a factor for serializing chang |
|
||
__init__.py |
4547.2.1 | 16 years ago | Andrew Bennetts | Trivial fix for undefined local 'url' in TooManyRe | 3.7 KB |
|
|
|
apply_bundle.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 2.8 KB |
|
|
|
bundle_data.py |
4325.3.4 | 16 years ago | Johan Walles | Merge from upstream. | 28.6 KB |
|
|
|
commands.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 3.8 KB |
|
|