~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Frank Aspell
  • Date: 2009-02-22 16:54:02 UTC
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: frankaspell@googlemail.com-20090222165402-2myrucnu7er5w4ha
Fixing various typos

Show diffs side-by-side

added added

removed removed

Lines of Context:
824
824
    def get_public_branch(self):
825
825
        """Return the public location of the branch.
826
826
 
827
 
        This is is used by merge directives.
 
827
        This is used by merge directives.
828
828
        """
829
829
        return self._get_config_location('public_branch')
830
830
 
1351
1351
        # the api signature is
1352
1352
        # (local, master, old_revno, old_revid, new_revno, new_revid) where
1353
1353
        # local is the local branch or None, master is the target branch,
1354
 
        # and an empty branch recieves new_revno of 0, new_revid of None.
 
1354
        # and an empty branch receives new_revno of 0, new_revid of None.
1355
1355
        self['post_uncommit'] = []
1356
1356
        # Introduced in 1.6
1357
1357
        # Invoked before the tip of a branch changes.