/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 bzrlib/tests/test_merge.py

  • Committer: Aaron Bentley
  • Date: 2007-12-20 02:47:39 UTC
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071220024739-nyw87k23467u4q31
Update prepare_cherrypick docstring

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
289
289
        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
290
290
 
291
291
    def prepare_cherrypick(self):
 
292
        """Prepare a pair of trees for cherrypicking tests.
 
293
 
 
294
        Both trees have a file, 'file'.
 
295
        rev1 sets content to 'a'.
 
296
        rev2b adds 'b'.
 
297
        rev3b adds 'c'.
 
298
        A full merge of rev2b and rev3b into this_tree would add both 'b' and
 
299
        'c'.  A successful cherrypick of rev2b-rev3b into this_tree will add
 
300
        'c', but not 'b'.
 
301
        """
292
302
        this_tree = self.make_branch_and_tree('this')
293
303
        self.build_tree_contents([('this/file', "a\n")])
294
304
        this_tree.add('file')