/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-30 23:53:38 UTC
  • mfrom: (6734.1.22 move-errors-more)
  • Revision ID: jelmer@jelmer.uk-20170730235338-25jy0lgifkyx796l
Merge lp:~jelmer/brz/move-errors-more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_commit.py
26
26
from ..branch import Branch
27
27
from ..bzr.bzrdir import BzrDirMetaFormat1
28
28
from ..commit import (
 
29
    CannotCommitSelectedFileMerge,
29
30
    Commit,
30
31
    NullCommitReporter,
 
32
    PointlessCommit,
31
33
    filter_excluded,
32
34
    )
33
35
from ..errors import (
34
 
    PointlessCommit,
35
36
    BzrError,
36
37
    LockContention,
37
38
    )
763
764
        tree.add_parent_tree_id('example')
764
765
        self.build_tree(['foo/bar', 'foo/baz'])
765
766
        tree.add(['bar', 'baz'])
766
 
        err = self.assertRaises(errors.CannotCommitSelectedFileMerge,
 
767
        err = self.assertRaises(CannotCommitSelectedFileMerge,
767
768
            tree.commit, 'commit 2', specific_files=['bar', 'baz'])
768
769
        self.assertEqual(['bar', 'baz'], err.files)
769
770
        self.assertEqual('Selected-file commit of merges is not supported'