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 | 1 KB |
|
|
|
ca.crt |
2929.3.13 | 18 years ago | Vincent Ladeuil | Update ssl generated files. Put the branch on the | 2.3 KB |
|
|
|
ca.key |
2929.3.13 | 18 years ago | Vincent Ladeuil | Update ssl generated files. Put the branch on the | 3.2 KB |
|
|
create_ssls.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 9.1 KB |
|
|
|
server.crt |
2929.3.18 | 18 years ago | Vincent Ladeuil | Fix the server name in script and ssl files. * bz | 1.9 KB |
|
|
|
server.csr |
2929.3.18 | 18 years ago | Vincent Ladeuil | Fix the server name in script and ssl files. * bz | 1.7 KB |
|
|
|
server_with_pass.key |
2929.3.18 | 18 years ago | Vincent Ladeuil | Fix the server name in script and ssl files. * bz | 3.2 KB |
|
|
|
server_without_pass.key |
2929.3.18 | 18 years ago | Vincent Ladeuil | Fix the server name in script and ssl files. * bz | 3.1 KB |
|
|