To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
« back to all changes in this revision
Viewing changes to errors.py
- 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.
* 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.
- files modified:
- tests/test_commit.py
added
removed
errors.py
