← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_pull.py
35
35
        tree.commit('foo', rev_id='A')
36
36
        tree_b = self.make_branch_and_tree('to')
37
37
        return tree, tree_b
38
 
 
 
38
 
39
39
    def test_pull(self):
40
40
        tree_a, tree_b = self.get_pullable_trees()
41
41
        tree_b.pull(tree_a.branch)