/b-gtk/fix-viz

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 bzr-handle-patch

  • 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr-handle-patch
33
33
        gtk = open_display()
34
34
        window.connect("destroy", gtk.main_quit)
35
35
except Exception, e:
36
 
        from dialog import error_dialog
 
36
        from bzrlib.plugins.gtk.dialog import error_dialog
37
37
        error_dialog('Error', str(e))
38
38
        raise
39
39
gtk.main()