/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/git/tests/test_blackbox.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-01-30 19:47:13 UTC
  • mfrom: (7473.1.1 add-file-ids-from)
  • Revision ID: breezy.the.bot@gmail.com-20200130194713-13dswfyu1q7muqnl
In 'brz add', ignore --file-ids-from for trees that do not support file ids.

Merged from https://code.launchpad.net/~jelmer/brz/add-file-ids-from/+merge/378351

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_blackbox.py
49
49
        r1 = builder.commit(b'Joe Foo <joe@foo.com>', u'<The commit message>')
50
50
        return repo, builder.finish()[r1]
51
51
 
 
52
    def test_add(self):
 
53
        r = GitRepo.init(self.test_dir)
 
54
        dir = ControlDir.open(self.test_dir)
 
55
        dir.create_branch()
 
56
        self.build_tree(['a', 'b'])
 
57
        output, error = self.run_bzr(['add', 'a'])
 
58
        self.assertEqual('adding a\n', output)
 
59
        self.assertEqual('', error)
 
60
        output, error = self.run_bzr(
 
61
            ['add', '--file-ids-from=../othertree', 'b'])
 
62
        self.assertEqual('adding b\n', output)
 
63
        self.assertEqual(
 
64
            'Ignoring --file-ids-from, since the tree does not support '
 
65
            'setting file ids.\n', error)
 
66
 
52
67
    def test_nick(self):
53
68
        r = GitRepo.init(self.test_dir)
54
69
        dir = ControlDir.open(self.test_dir)