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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
centralized_workflow.txt |
3638.6.38 | 16 years ago | Alexey Shtokalo | * изменен способ рисования плашек в карточке быстр | 20.3 KB |
|
|
|
tutorial.txt |
3638.6.38 | 16 years ago | Alexey Shtokalo | * изменен способ рисования плашек в карточке быстр | 37.6 KB |
|
|
|
using_bazaar_with_launchpad.txt |
3638.6.25 | 16 years ago | Dmitry Vasiliev | using_bazaar_with_launchpad.txt: Update and review | 31 KB |
|
|