/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_commit.py

  • Committer: John Ferlito
  • Date: 2009-10-06 13:57:12 UTC
  • mto: This revision was merged to the branch mainline in revision 668.
  • Revision ID: johnf@inodes.org-20091006135712-22vfb36os1toe5qb
Encoding key is now deprecated in the FreeDesktop standard

Show diffs side-by-side

added added

removed removed

Lines of Context:
91
91
        rev_id4 = tree3.commit('four')
92
92
        rev_id5 = tree3.commit('five')
93
93
        tree.merge_from_branch(tree2.branch)
94
 
        tree.merge_from_branch(tree3.branch, force=True)
 
94
        tree.merge_from_branch(tree3.branch)
95
95
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
96
96
 
97
97
        pending_revisions = commit.pending_revisions(tree)
271
271
                               committer='Jerry Foo <jerry@foo.com>',
272
272
                               timestamp=1191372278.05,
273
273
                               timezone=+7200)
274
 
        tree.merge_from_branch(tree3.branch, force=True)
 
274
        tree.merge_from_branch(tree3.branch)
275
275
 
276
276
        dlg = commit.CommitDialog(tree)
277
277
        # TODO: assert that the pending box is set to show