← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interbranch/test_update_revisions.py

  • Committer: Andrew Bennetts
  • Date: 2010-07-28 07:05:19 UTC
  • mfrom: (5050.3.15 2.2)
  • mto: (5050.3.16 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100728070519-kkflohg6djas3ui4
Merge lp:bzr/2.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_update_revisions.py
1
 
# Copyright (C) 2009 Canonical Ltd
 
1
# Copyright (C) 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
26
26
 
27
27
    def setUp(self):
28
28
        super(TestUpdateRevisions, self).setUp()
29
 
        self.tree1 = self.make_branch_and_tree('tree1')
 
29
        self.tree1 = self.make_from_branch_and_tree('tree1')
30
30
        rev1 = self.tree1.commit('one')
31
31
        branch2 = self.make_to_branch('tree2')
32
32
        branch2.repository.fetch(self.tree1.branch.repository)