← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisionspec.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisionspec.py
27
27
    symbol_versioning,
28
28
    workingtree,
29
29
    )
30
 
from bzrlib.i18n import gettext
31
30
""")
32
31
 
33
32
from bzrlib import (
911
910
            location_type = 'parent branch'
912
911
        if submit_location is None:
913
912
            raise errors.NoSubmitBranch(branch)
914
 
        trace.note(gettext('Using {0} {1}').format(location_type,
915
 
                                                        submit_location))
 
913
        trace.note('Using %s %s', location_type, submit_location)
916
914
        return submit_location
917
915
 
918
916
    def _match_on(self, branch, revs):