/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: Robert Collins
  • Date: 2010-04-14 04:48:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5153.
  • Revision ID: robertc@robertcollins.net-20100414044800-wda5phry84h497pn
``bzr update`` when a pending merge in the working tree has been merged
into the master branch will no longer claim that old commits have become
pending merges. (Robert Collins, #562079)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
111
111
                base_revision_id = revision[0].as_revision_id(branch)
112
112
        if revision_id is None:
113
113
            if tree is not None:
114
 
                tree.check_changed_or_out_of_date(
115
 
                    strict, 'send_strict',
116
 
                    more_error='Use --no-strict to force the send.',
117
 
                    more_warning='Uncommitted changes will not be sent.')
 
114
                tree.warn_if_changed_or_out_of_date(
 
115
                    strict, 'send_strict', 'Use --no-strict to force the send.')
118
116
            revision_id = branch.last_revision()
119
117
        if revision_id == NULL_REVISION:
120
118
            raise errors.BzrCommandError('No revisions to submit.')