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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
admin-guide
|
3183.3.2 | 17 years ago | Matthew Revell | Added an admin-guide directory to doc/en and outli |
|
||
|
developer-guide
|
2691.1.1 | 18 years ago | Ian Clatworthy | move most existing topics into the User Guide dir |
|
||
|
mini-tutorial
|
2691.1.11 | 18 years ago | Ian Clatworthy | Added mini tutorial |
|
||
|
quick-reference
|
2691.1.12 | 18 years ago | Ian Clatworthy | Added Quick Start Summary |
|
||
|
release-notes
|
2691.1.1 | 18 years ago | Ian Clatworthy | move most existing topics into the User Guide dir |
|
||
|
tutorials
|
2977.1.13 | 18 years ago | Ian Clatworthy | more cleanups and creation of tutorials directory |
|
||
|
upgrade-guide
|
4501.3.1 | 16 years ago | Ian Clatworthy | first draft of a 2.0 Upgrade Guide |
|
||
|
user-guide
|
2691.1.1 | 18 years ago | Ian Clatworthy | move most existing topics into the User Guide dir |
|
||
|
user-reference
|
2691.1.1 | 18 years ago | Ian Clatworthy | move most existing topics into the User Guide dir |
|
||