~vila/bzr/426344-check-pending-merges

Viewing all changes in revision 4674.

  • Committer: Vincent Ladeuil
  • Date: 2009-09-08 16:42:51 UTC
  • 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: