← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_revision.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_revision.py
69
69
        tree1 = self.make_branch_and_tree("br1")
70
70
 
71
71
        # create a revision
72
 
        tree1.commit(message="quux", allow_pointless=True, committer="jaq",
73
 
                     revprops={'empty':'',
74
 
                               'value':'one',
75
 
                               'unicode':u'\xb5',
76
 
                               'multiline':'foo\nbar\n\n'
77
 
                              })
78
 
        self.assertTrue(len(tree1.branch.revision_history()) > 0)
 
72
        rev1 = tree1.commit(message="quux", allow_pointless=True,
 
73
            committer="jaq",
 
74
            revprops={'empty':'',
 
75
                      'value':'one',
 
76
                      'unicode':u'\xb5',
 
77
                      'multiline':'foo\nbar\n\n'
 
78
                      })
 
79
        self.assertEquals(tree1.branch.last_revision(), rev1)
79
80
        rev_a = tree1.branch.repository.get_revision(
80
81
                            tree1.branch.last_revision())
81
82