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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
configobj
|
1185.12.49 | 20 years ago | Aaron Bentley | Switched to ConfigObj |
|
||
|
effbot
|
1185.1.29 | 20 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
elementtree
|
1185.1.29 | 20 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
tests
|
2613.1.2 | 18 years ago | Martin Pool | Move bencode tests into util.tests |
|
||
__init__.py |
1185.1.29 | 20 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | Empty |
|
|
|
_bencode_py.py |
4360.5.4 | 16 years ago | Robert J. Tanner | Merge 1.15.1 back to trunk | 4.3 KB |
|
|
|
bencode.py |
4420.3.1 | 16 years ago | Matt Nordhoff | bzrlib.util.bencode's deprecation warning used the | 1005 bytes |
|
|
|
simplemapi.py |
3943.8.1 | 17 years ago | Marius Kruger | remove all trailing whitespace from bzr source | 8.2 KB |
|
|