/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/blackbox/test_uncommit.py

  • Committer: Robert Collins
  • Date: 2006-09-11 01:03:59 UTC
  • mto: This revision was merged to the branch mainline in revision 2019.
  • Revision ID: robertc@robertcollins.net-20060911010359-0404571fa92c5cfe
``Branch.bind(other_branch)`` no longer takes a write lock on the
other branch, and will not push or pull between the two branches.
API users will need to perform a push or pull or update operation if they
require branch synchronisation to take place. (Robert Collins)

``bzr bind`` no longer synchronises history with the master branch.
Binding should be followed by an update or push to synchronise the 
two branches. This fixes bug #39542 for heavyweight checkouts.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
62
62
 
63
63
    def test_uncommit_checkout(self):
64
64
        wt = self.create_simple_tree()
65
 
 
66
 
        checkout_tree = wt.bzrdir.sprout('checkout').open_workingtree()
67
 
        checkout_tree.branch.bind(wt.branch)
 
65
        checkout_tree = wt.branch.create_checkout('checkout')
68
66
 
69
67
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
70
68
 
95
93
        t_a.commit('commit 1')
96
94
        t_a.commit('commit 2')
97
95
        t_a.commit('commit 3')
98
 
        b = t_a.bzrdir.sprout('b').open_branch()
99
 
        b.bind(t_a.branch)
 
96
        b = t_a.branch.create_checkout('b').branch
100
97
        uncommit.uncommit(b)
101
98
        self.assertEqual(len(b.revision_history()), 2)
102
99
        self.assertEqual(len(t_a.branch.revision_history()), 2)