← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_core.py

  • Committer: Andrew Bennetts
  • Date: 2007-03-28 07:08:42 UTC
  • mfrom: (2380 +trunk)
  • mto: (2018.5.146 hpss)
  • mto: This revision was merged to the branch mainline in revision 2414.
  • Revision ID: andrew.bennetts@canonical.com-20070328070842-r843houy668oxb9o
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
49
49
           # the tests perform pulls, so need a branch that is writeable.
50
50
           wt.lock_write()
51
51
           wt.set_root_id(self.tree_root)
 
52
           wt.flush()
52
53
           tt = TreeTransform(wt)
53
54
           return wt, tt
54
55
        self.base, self.base_tt = wt('base')
77
78
            # why does this not do wt.pull() ?
78
79
            wt.branch.pull(self.base.branch)
79
80
            wt.set_parent_ids([wt.branch.last_revision()])
 
81
            wt.flush()
 
82
            # We maintain a write lock, so make sure changes are flushed to
 
83
            # disk first
80
84
            tt.apply()
81
85
            wt.commit('branch commit')
 
86
            wt.flush()
82
87
            assert len(wt.branch.revision_history()) == 2
83
88
        self.this.branch.fetch(self.other.branch)
84
89
        other_basis = self.other.branch.basis_tree()