/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/per_workingtree/test_annotate_iter.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_annotate_iter.py
46
46
        annotations = tree.annotate_iter('file')
47
47
        self.assertEqual([(revid, b'initial content\n'),
48
48
                          (b'current:', b'new content\n'),
49
 
                         ], annotations)
 
49
                          ], annotations)
50
50
 
51
51
    def test_annotate_merge_parents(self):
52
52
        builder = self.make_branch_builder('branch')
75
75
                          (revid2, b'content in 2\n'),
76
76
                          (revid3, b'content in 3\n'),
77
77
                          (b'current:', b'new content\n'),
78
 
                         ], annotations)
 
78
                          ], annotations)
79
79
 
80
80
    def test_annotate_merge_parent_no_file(self):
81
81
        builder = self.make_branch_builder('branch')
98
98
        annotations = tree.annotate_iter('file')
99
99
        self.assertEqual([(revid2, b'initial content\n'),
100
100
                          (b'current:', b'new content\n'),
101
 
                         ], annotations)
 
101
                          ], annotations)
102
102
 
103
103
    def test_annotate_merge_parent_was_directory(self):
104
104
        builder = self.make_branch_builder('branch')
123
123
        annotations = tree.annotate_iter('file')
124
124
        self.assertEqual([(revid2, b'initial content\n'),
125
125
                          (b'current:', b'new content\n'),
126
 
                         ], annotations)
 
126
                          ], annotations)
127
127
 
128
128
    def test_annotate_same_as_merge_parent(self):
129
129
        builder = self.make_branch_builder('branch')
148
148
        annotations = tree.annotate_iter('file')
149
149
        self.assertEqual([(revid1, b'initial content\n'),
150
150
                          (revid3, b'content in 3\n'),
151
 
                         ], annotations)
 
151
                          ], annotations)
152
152
 
153
153
    def test_annotate_same_as_merge_parent_supersedes(self):
154
154
        builder = self.make_branch_builder('branch')
177
177
        annotations = tree.annotate_iter('file')
178
178
        self.assertEqual([(revid1, b'initial content\n'),
179
179
                          (revid4, b'new content\n'),
180
 
                         ], annotations)
181
 
 
 
180
                          ], annotations)