← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-20 19:46:46 UTC
  • mfrom: (4759 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4771.
  • Revision ID: john@arbash-meinel.com-20091020194646-wnqpd15qs19y28z7
Merge bzr.dev 4759, bringing in static_tuple and streaming improvements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
115
115
                    ).get_user_option_as_bool('send_strict')
116
116
            if strict is None: strict = True # default value
117
117
            if strict and tree is not None:
118
 
                if (tree.has_changes(tree.basis_tree())
119
 
                    or len(tree.get_parent_ids()) > 1):
 
118
                if (tree.has_changes()):
120
119
                    raise errors.UncommittedChanges(
121
120
                        tree, more='Use --no-strict to force the send.')
122
121
                if tree.last_revision() != tree.branch.last_revision():
123
122
                    # The tree has lost sync with its branch, there is little
124
123
                    # chance that the user is aware of it but he can still force
125
 
                    # the push with --no-strict
 
124
                    # the send with --no-strict
126
125
                    raise errors.OutOfDateTree(
127
126
                        tree, more='Use --no-strict to force the send.')
128
127
            revision_id = branch.last_revision()