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

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_commit_merge.py
98
98
 
99
99
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
100
100
        tree = by.repository.revision_tree('y@u-0-2')
101
 
        self.assertEqual(tree.get_file_revision('ecks-id'), 'x@u-0-1')
102
 
        self.assertEqual(tree.get_file_revision('why-id'), 'y@u-0-1')
 
101
        self.assertEqual(tree.get_file_revision('ecks'), 'x@u-0-1')
 
102
        self.assertEqual(tree.get_file_revision('why'), 'y@u-0-1')
103
103
 
104
104
        check.check_dwim(bx.base, False, True, True)
105
105
        check.check_dwim(by.base, False, True, True)