Viewing all changes in revision 4672.3.2.
- Committer: Vincent Ladeuil
- Date: 2009-09-08 16:42:51 UTC
- mto: (4681.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4682.
- 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.
- files modified:
- bzrlib/builtins.py
expand all
collapse all
added
removed
