← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/foreign.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/foreign.py
305
305
                ).get_user_option_as_bool('dpush_strict')
306
306
        if strict is None: strict = True # default value
307
307
        if strict and source_wt is not None:
308
 
            if (source_wt.has_changes(source_wt.basis_tree())
309
 
                or len(source_wt.get_parent_ids()) > 1):
 
308
            if (source_wt.has_changes()):
310
309
                raise errors.UncommittedChanges(
311
310
                    source_wt, more='Use --no-strict to force the push.')
312
311
            if source_wt.last_revision() != source_wt.branch.last_revision():