← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_pull.py

  • Committer: Patch Queue Manager
  • Date: 2016-02-01 19:13:13 UTC
  • mfrom: (6614.2.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20160201191313-wdfvmfff1djde6oq
(vila) Release 2.7.0 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_pull.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009-2012, 2016 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
35
35
        tree_a, tree_b = self.get_pullable_trees()
36
36
        root_id = tree_a.get_root_id()
37
37
        tree_a.pull(tree_b.branch, stop_revision=NULL_REVISION, overwrite=True)
38
 
        self.assertEquals(root_id, tree_a.get_root_id())
 
38
        self.assertEqual(root_id, tree_a.get_root_id())
39
39
 
40
40
    def test_pull(self):
41
41
        tree_a, tree_b = self.get_pullable_trees()