← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-15 07:32:26 UTC
  • mfrom: (4536 +trunk)
  • mto: (4536.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4537.
  • Revision ID: v.ladeuil+lp@free.fr-20090715073226-a7ylxd6ctbzeu0o6
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
112
112
                    ).get_user_option_as_bool('send_strict')
113
113
            if strict is None: strict = True # default value
114
114
            if strict and tree is not None:
115
 
                changes = tree.changes_from(tree.basis_tree())
116
 
                if changes.has_changed() or len(tree.get_parent_ids()) > 1:
 
115
                if (tree.has_changes(tree.basis_tree())
 
116
                    or len(tree.get_parent_ids()) > 1):
117
117
                    raise errors.UncommittedChanges(
118
118
                        tree, more='Use --no-strict to force the send.')
119
119
                if tree.last_revision() != tree.branch.last_revision():