/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-11-16 18:35:30 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7178.
  • Revision ID: jelmer@jelmer.uk-20181116183530-ue8yx60h5tinl2wy
Merge more-cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge.py
529
529
        source.add('foo', b'foo-id')
530
530
        source.commit('Add foo')
531
531
        target = source.controldir.sprout('target').open_workingtree()
532
 
        subtree = target.extract('foo', b'foo-id')
 
532
        subtree = target.extract('foo')
533
533
        subtree.commit('Delete root')
534
534
        self.build_tree(['source/bar'])
535
535
        source.add('bar', b'bar-id')