/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/branch.py

  • Committer: Aaron Bentley
  • Date: 2005-10-24 15:56:15 UTC
  • mfrom: (1185.16.99)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1488.
  • Revision ID: abentley@panoramicfeedback.com-20051024155615-6af1ed78ba9e4f9f
Merge from mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
395
395
        """Return location relative to branch."""
396
396
        return self._transport.abspath(self._rel_controlfilename(file_or_path))
397
397
 
398
 
 
399
398
    def controlfile(self, file_or_path, mode='r'):
400
399
        """Open a control file for this branch.
401
400
 
880
879
 
881
880
    def update_revisions(self, other, stop_revision=None):
882
881
        """Pull in new perfect-fit revisions."""
883
 
        # FIXME: If the branches have diverged, but the latest
884
 
        # revision in this branch is completely merged into the other,
885
 
        # then we should still be able to pull.
886
882
        from bzrlib.fetch import greedy_fetch
887
883
        if stop_revision is None:
888
884
            stop_revision = other.last_revision()