← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-12 20:12:32 UTC
  • mfrom: (4736 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4749.
  • Revision ID: john@arbash-meinel.com-20091012201232-ccnceqvk29u7v22u
Merge bzr.dev 4736

This includes the updates to StaticTuple, etc, to build using Pyrex 0.9.6.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
56
56
                        change_reporter=change_reporter)
57
57
        merger.pp = pp
58
58
        merger.pp.next_phase()
59
 
        merger.check_basis(check_clean, require_commits=False)
 
59
        if check_clean and tree.has_changes():
 
60
            raise errors.UncommittedChanges(self)
60
61
        merger.other_rev_id = reader.target
61
62
        merger.other_tree = merger.revision_tree(reader.target)
62
63
        merger.other_basis = reader.target