← 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: Robert Collins
  • Date: 2006-04-12 04:57:34 UTC
  • mto: This revision was merged to the branch mainline in revision 1654.
  • Revision ID: robertc@robertcollins.net-20060412045734-3e03b7af0860a5a9
 * 'pull' and 'push' now normalise the revision history, so that any two
   branches with the same tip revision will have the same output from 'log'.
   (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
55
55
    tree1.commit("Commit two", rev_id="a@u-0-1")
56
56
    tree1.commit("Commit three", rev_id="a@u-0-2")
57
57
 
58
 
    tree2 = self.make_branch_and_tree("branch2")
 
58
    tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
59
59
    br2 = tree2.branch
60
 
    br2.update_revisions(br1)
61
60
    tree2.commit("Commit four", rev_id="b@u-0-3")
62
61
    tree2.commit("Commit five", rev_id="b@u-0-4")
63
62
    revisions_2 = br2.revision_history()