← 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
298
298
''')
299
299
        self.assertPathExists('./file1')
300
300
        self.assertPathDoesNotExist('./file2')
301
 
        self.assertEquals(['m1'], master.get_parent_ids())
 
301
        self.assertEqual(['m1'], master.get_parent_ids())
302
302
 
303
303
    def test_update_dash_r_outside_history(self):
304
304
        """Ensure that we can update -r to dotted revisions.