← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: John Arbash Meinel
  • Date: 2008-10-30 00:55:00 UTC
  • mto: (3815.2.5 prepare-1.9)
  • mto: This revision was merged to the branch mainline in revision 3811.
  • Revision ID: john@arbash-meinel.com-20081030005500-r5cej1cxflqhs3io
Switch so that we are using a simple timestamp as the first action.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
142
142
        wt2.merge_from_branch(self.br1)
143
143
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
144
144
 
145
 
        from bzrlib.revision import MultipleRevisionSources
146
 
        self.sources = self.applyDeprecated(one_three,
147
 
                        MultipleRevisionSources, self.br1.repository,
148
 
                                                 self.br2.repository)
149
 
 
150
 
 
151
145
 
152
146
class MockRevisionSource(object):
153
147
    """A RevisionSource that takes a pregenerated graph.