← Back to branch summary

~ubuntu-branches/ubuntu/karmic/bzr/karmic-proposed

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2008-08-25 19:06:49 UTC
  • mfrom: (1.1.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20080825190649-pq87jonr4uvs7s0y
Tags: 1.6-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
116
116
#  |\
117
117
#  A B  # line should be annotated as new for A and B
118
118
#  |\|
119
 
#  C D  # line should 'converge' and say D
 
119
#  C D  # line should 'converge' and say A
120
120
#  |/
121
121
#  E    # D should supersede A and stay as D (not become E because C references
122
122
#         A)
150
150
 
151
151
duplicate_D = annotation("""\
152
152
rev-base first
153
 
rev-D alt-second
 
153
rev-A alt-second
154
154
rev-base third
155
155
rev-D fourth-D
156
156
""")
157
157
 
158
158
duplicate_E = annotation("""\
159
159
rev-base first
160
 
rev-D alt-second
 
160
rev-A alt-second
161
161
rev-base third
162
162
rev-E fourth-E
163
163
""")
184
184
                     committer="joe@foo.com",
185
185
                     timestamp=1166046000.00, timezone=0)
186
186
 
187
 
        tree2 = tree1.bzrdir.clone('tree2').open_workingtree()
 
187
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
188
188
 
189
189
        self.build_tree_contents([('tree1/a', 'first\nsecond\n')])
190
190
        tree1.commit('b', rev_id='rev-2',
235
235
        tree1, tree2 = self.create_merged_trees()
236
236
        tree1.unlock()
237
237
 
238
 
        tree3 = tree2.bzrdir.clone('tree3').open_workingtree()
 
238
        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
239
239
 
240
240
        tree2.commit('noop', rev_id='rev-1_1_2')
241
241
        self.assertEqual(0, tree1.merge_from_branch(tree2.branch))
246
246
                     committer='jerry@foo.com',
247
247
                     timestamp=1166046003.00, timezone=0)
248
248
 
249
 
        tree4 = tree3.bzrdir.clone('tree4').open_workingtree()
 
249
        tree4 = tree3.bzrdir.sprout('tree4').open_workingtree()
250
250
 
251
251
        tree3.commit('noop', rev_id='rev-1_2_2',
252
252
                     committer='jerry@foo.com',
275
275
        self.build_tree_contents([('tree1/file', base_text)])
276
276
        tree1.add(['file'], ['file-id'])
277
277
        tree1.commit('base', rev_id='rev-base')
278
 
        tree2 = tree1.bzrdir.clone('tree2').open_workingtree()
 
278
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
279
279
 
280
280
        self.build_tree_contents([('tree1/file', a_text),
281
281
                                  ('tree2/file', b_text)])