~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-06-05 04:05:05 UTC
  • mfrom: (3473.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080605040505-i9kqxg2fps2qjdi0
Add the 'alias' command (Tim Penhey)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
145
151
 
146
152
class MockRevisionSource(object):
147
153
    """A RevisionSource that takes a pregenerated graph.