← Back to branch summary

~jelmer/brz/remove-branch-base

« back to all changes in this revision

Viewing changes to breezy/tests/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-16 19:38:39 UTC
  • mfrom: (6852.3.1 is-versioned)
  • Revision ID: jelmer@jelmer.uk-20180216193839-a0efzmp1o64g86ln
Merge lp:~jelmer/brz/is-versioned.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge.py
532
532
        source.add('foo', 'foo-id')
533
533
        source.commit('Add foo')
534
534
        target = source.controldir.sprout('target').open_workingtree()
535
 
        subtree = target.extract('foo-id')
 
535
        subtree = target.extract('foo', 'foo-id')
536
536
        subtree.commit('Delete root')
537
537
        self.build_tree(['source/bar'])
538
538
        source.add('bar', 'bar-id')
2300
2300
        wt.set_parent_ids(['D-id'])
2301
2301
        wt.branch.set_last_revision_info(3, 'D-id')
2302
2302
        wt.revert()
2303
 
        self.assertIs(None, wt.path2id('foo'))
 
2303
        self.assertFalse(wt.is_versioned('foo'))
2304
2304
        conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2305
2305
        self.assertEqual(0, conflicts)
2306
2306
        self.assertEqual('foo-id', wt.path2id('foo'))