~toshio/bzr-gtk/handle-dirty-patches

Viewing all changes in revision 670.

  • Committer: Vincent Ladeuil
  • Date: 2009-12-02 11:12:51 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20091202111251-sh0xqyqtuvitonne
Fix regressions in tests about merge being more strict by default.

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge)
(TestCommitDialog.test_pending_multiple): Since there are pending
merges, we should force the merge to avoid the UncommittedChanges
exception.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: