/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_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2018-10-29 11:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 7170.
  • Revision ID: jelmer@jelmer.uk-20181029112733-bjvm24z12svwl53m
Get rid of file_ids in most of Tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge.py
524
524
        source.add('foo', b'foo-id')
525
525
        source.commit('Add foo')
526
526
        target = source.controldir.sprout('target').open_workingtree()
527
 
        subtree = target.extract('foo', b'foo-id')
 
527
        subtree = target.extract('foo')
528
528
        subtree.commit('Delete root')
529
529
        self.build_tree(['source/bar'])
530
530
        source.add('bar', b'bar-id')