← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Robert Collins
  • Date: 2008-02-13 03:30:01 UTC
  • mfrom: (3221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3224.
  • Revision ID: robertc@robertcollins.net-20080213033001-rw70ul0zb02ph856
Merge to fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
498
498
        sure everything matches the builtin branch.
499
499
        """
500
500
        to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
 
501
        to_tree.lock_write()
 
502
        try:
 
503
            self._valid_apply_bundle(base_rev_id, info, to_tree)
 
504
        finally:
 
505
            to_tree.unlock()
 
506
 
 
507
    def _valid_apply_bundle(self, base_rev_id, info, to_tree):
501
508
        original_parents = to_tree.get_parent_ids()
502
509
        repository = to_tree.branch.repository
503
510
        original_parents = to_tree.get_parent_ids()