← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevision.py

  • Committer: Robert Collins
  • Date: 2005-11-07 20:29:51 UTC
  • mfrom: (1457.1.17)
  • Revision ID: robertc@robertcollins.net-20051107202951-6ae936c7a3e57f6f
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevision.py
144
144
        TestCaseInTempDir.setUp(self)
145
145
        self.br1, self.br2 = make_branches(self)
146
146
 
147
 
        self.br2.commit("Commit eleven", rev_id="b@u-0-7")
148
 
        self.br2.commit("Commit twelve", rev_id="b@u-0-8")
149
 
        self.br2.commit("Commit thirtteen", rev_id="b@u-0-9")
 
147
        self.br2.working_tree().commit("Commit eleven", rev_id="b@u-0-7")
 
148
        self.br2.working_tree().commit("Commit twelve", rev_id="b@u-0-8")
 
149
        self.br2.working_tree().commit("Commit thirtteen", rev_id="b@u-0-9")
150
150
 
151
151
        fetch(from_branch=self.br2, to_branch=self.br1)
152
152
        self.br1.working_tree().add_pending_merge(self.br2.revision_history()[6])
153
 
        self.br1.commit("Commit fourtten", rev_id="a@u-0-6")
 
153
        self.br1.working_tree().commit("Commit fourtten", rev_id="a@u-0-6")
154
154
 
155
155
        fetch(from_branch=self.br1, to_branch=self.br2)
156
156
        self.br2.working_tree().add_pending_merge(self.br1.revision_history()[6])
157
 
        self.br2.commit("Commit fifteen", rev_id="b@u-0-10")
 
157
        self.br2.working_tree().commit("Commit fifteen", rev_id="b@u-0-10")
158
158
 
159
159
        from bzrlib.revision import MultipleRevisionSources
160
160
        self.sources = MultipleRevisionSources(self.br1, self.br2)