/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_workingtree.py
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#           and others
4
4
#
478
478
        self.assertEqual(wt.get_root_id(), checkout.get_root_id())
479
479
        self.assertNotEqual(None, wt.get_root_id())
480
480
 
 
481
    def test_update_sets_updated_root_id(self):
 
482
        wt = self.make_branch_and_tree('tree')
 
483
        wt.set_root_id('first_root_id')
 
484
        self.assertEqual('first_root_id', wt.get_root_id())
 
485
        self.build_tree(['tree/file'])
 
486
        wt.add(['file'])
 
487
        wt.commit('first')
 
488
        co = wt.branch.create_checkout('checkout')
 
489
        wt.set_root_id('second_root_id')
 
490
        wt.commit('second')
 
491
        self.assertEqual('second_root_id', wt.get_root_id())
 
492
        self.assertEqual(0, co.update())
 
493
        self.assertEqual('second_root_id', co.get_root_id())
 
494
 
481
495
    def test_update_returns_conflict_count(self):
482
496
        # working tree formats from the meta-dir format and newer support
483
497
        # setting the last revision on a tree independently of that on the