/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/per_workingtree/test_smart_add.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_smart_add.py
322
322
        self.build_tree_contents([('t1/file', b'content in t1')])
323
323
        t1.commit('Changing file in t1')
324
324
        t1.merge_from_branch(tb.branch)
 
325
        fnames = ['file.%s' % s for s in ('BASE', 'THIS', 'OTHER')]
 
326
        for fn in fnames:
 
327
            self.assertPathExists(os.path.join(t1.basedir, fn))
325
328
        return t1
326
329
 
327
330
    def test_cant_add_generated_files_implicitly(self):