/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Ian Clatworthy
  • Date: 2009-07-13 06:04:28 UTC
  • mfrom: (4527 +trunk)
  • mto: (4527.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4529.
  • Revision ID: ian.clatworthy@canonical.com-20090713060428-5m6apiywie6aqg6v
merge bzr.dev r4527

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
119
119
                    except KeyError:
120
120
                        strict = None
121
121
            if tree is not None and (strict is None or strict):
122
 
                changes = tree.changes_from(tree.basis_tree())
123
 
                if changes.has_changed() or len(tree.get_parent_ids()) > 1:
 
122
                if (tree.has_changes(tree.basis_tree())
 
123
                    or len(tree.get_parent_ids()) > 1):
124
124
                    raise errors.UncommittedChanges(
125
125
                        tree, more='Use --no-strict to force the send.')
126
126
                if tree.last_revision() != tree.branch.last_revision():