/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/workingtree_implementations/test_workingtree.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_workingtree.py
351
351
        wt.commit('A', rev_id='A')
352
352
        wt.rename_one('foo', 'bar')
353
353
        wt.commit('B', rev_id='B')
354
 
        wt.set_last_revision('B')
 
354
        wt.set_parent_ids(['B'])
355
355
        tree = wt.basis_tree()
356
356
        self.failUnless(tree.has_filename('bar'))
357
 
        wt.set_last_revision('A')
 
357
        wt.set_parent_ids(['A'])
358
358
        tree = wt.basis_tree()
359
359
        self.failUnless(tree.has_filename('foo'))
360
360
 
501
501
        # alter 'revert' to revert to the master always. But for now, its
502
502
        # good.
503
503
        master_tree = self.make_branch_and_tree('master')
 
504
        master_tip = master_tree.commit('first master commit')
504
505
        tree = self.make_branch_and_tree('tree')
505
506
        try:
506
507
            tree.branch.bind(master_tree.branch)
507
508
        except errors.UpgradeRequired:
508
509
            # legacy branches cannot bind
509
510
            return
 
511
        # sync with master
 
512
        tree.update()
 
513
        # work locally
510
514
        tree.commit('foo', rev_id='foo', allow_pointless=True, local=True)
511
515
        tree.commit('bar', rev_id='bar', allow_pointless=True, local=True)
 
516
        # sync with master prepatory to committing
512
517
        tree.update()
513
 
        self.assertEqual(None, tree.last_revision())
514
 
        self.assertEqual([], tree.branch.revision_history())
515
 
        self.assertEqual(['bar'], tree.pending_merges())
 
518
        # which should have pivoted the local tip into a merge
 
519
        self.assertEqual(master_tip, tree.last_revision())
 
520
        self.assertEqual([master_tip], tree.branch.revision_history())
 
521
        self.assertEqual([master_tip, 'bar'], tree.get_parent_ids())
516
522
 
517
523
    def test_merge_modified(self):
518
524
        tree = self.make_branch_and_tree('master')
656
662
                tree.add, [u'a\u030a'])
657
663
        finally:
658
664
            osutils.normalized_filename = orig
659
 
 
660