← Back to branch summary

~jelmer/bzr-loom/lp-pqm

« back to all changes in this revision

Viewing changes to tests/test_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-21 20:50:57 UTC
  • mfrom: (34.20.53 trunk)
  • mto: This revision was merged to the branch mainline in revision 52.
  • Revision ID: jelmer@samba.org-20111221205057-m65gvc689r9zd0aq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_branch.py
338
338
        if source_threads:
339
339
            source_tree.branch.generate_revision_history(source_threads[-1][1])
340
340
        self.assertEqual(
341
 
            source_tree.branch.revision_history(),
342
 
            target_tree.branch.revision_history())
343
 
        self.assertEqual(
344
 
            source_tree.branch.last_revision(),
345
 
            target_tree.last_revision())
 
341
            source_tree.branch.last_revision_info(),
 
342
            target_tree.branch.last_revision_info())
346
343
 
347
344
    def test_pull_loom_at_bottom(self):
348
345
        """Pulling from a loom when in the bottom warp pulls all warps."""