← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_update.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/blackbox/test_update.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
194
194
 
195
195
        self.build_tree(['checkout1/'])
196
196
        checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
197
 
        branch.BranchReferenceFormat().initialize(checkout_dir,
198
 
            target_branch=master.branch)
 
197
        checkout_dir.set_branch_reference(master.branch)
199
198
        checkout1 = checkout_dir.create_workingtree('m1')
200
199
 
201
200
        # Create a second branch, with an extra commit
251
250
 
252
251
        self.build_tree(['checkout1/'])
253
252
        checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
254
 
        branch.BranchReferenceFormat().initialize(checkout_dir,
255
 
            target_branch=master.branch)
 
253
        checkout_dir.set_branch_reference(master.branch)
256
254
        checkout1 = checkout_dir.create_workingtree('m1')
257
255
 
258
256
        # Create a second branch, with an extra commit
300
298
''')
301
299
        self.assertPathExists('./file1')
302
300
        self.assertPathDoesNotExist('./file2')
303
 
        self.assertEquals(['m1'], master.get_parent_ids())
 
301
        self.assertEqual(['m1'], master.get_parent_ids())
304
302
 
305
303
    def test_update_dash_r_outside_history(self):
306
304
        """Ensure that we can update -r to dotted revisions.