/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: Jelmer Vernooij
  • Date: 2020-08-22 22:46:24 UTC
  • mfrom: (7490.40.105 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200822224624-om4a4idsr7cn8jew
merge lp:brz/3.1.

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):