/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: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_commit_merge.py
46
46
        wty = wtx.controldir.sprout('y').open_workingtree()
47
47
        by = wty.branch
48
48
 
49
 
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
50
 
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
 
49
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
50
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
51
51
 
52
52
        by.fetch(bx)
53
53
        # just having the history there does nothing
54
54
        self.assertRaises(PointlessCommit,
55
55
                          wty.commit,
56
 
                          'no changes yet', rev_id=b'y@u-0-2',
 
56
                          'no changes yet', rev_id='y@u-0-2',
57
57
                          allow_pointless=False)
58
58
        wty.merge_from_branch(bx)
59
 
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
 
59
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
60
60
 
61
61
        self.assertEqual(by.revno(), 3)
62
62
        graph = wty.branch.repository.get_graph()
80
80
 
81
81
        self.build_tree(['x/ecks', 'y/why'])
82
82
 
83
 
        wtx.add(['ecks'], [b'ecks-id'])
84
 
        wty.add(['why'], [b'why-id'])
 
83
        wtx.add(['ecks'], ['ecks-id'])
 
84
        wty.add(['why'], ['why-id'])
85
85
 
86
 
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
87
 
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
 
86
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
87
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
88
88
 
89
89
        wty.merge_from_branch(bx)
90
90
 
96
96
                          'partial commit', allow_pointless=False,
97
97
                          specific_files=['ecks'])
98
98
 
99
 
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
100
 
        tree = by.repository.revision_tree(b'y@u-0-2')
101
 
        self.assertEqual(tree.get_file_revision('ecks'), b'x@u-0-1')
102
 
        self.assertEqual(tree.get_file_revision('why'), b'y@u-0-1')
 
99
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
100
        tree = by.repository.revision_tree('y@u-0-2')
 
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)