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 |
1185.1.29 | 20 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | 55 bytes |
|
|
|
gzip_consumer.py |
1185.1.29 | 20 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | 1.8 KB |
|
|
|
http_client.py |
1393.2.1 | 20 years ago | John Arbash Meinel | Merged in split-storage-2 branch. Need to cleanup | 7.8 KB |
|
|
|
http_manager.py |
1185.1.29 | 20 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | 2.1 KB |
|
|