~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2005-06-10 09:08:09 UTC
  • Revision ID: mbp@sourcefrog.net-20050610090809-648401fe0bde7b7a
doc

Show diffs side-by-side

added added

removed removed

Lines of Context:
695
695
 
696
696
 
697
697
    def update_revisions(self, other):
698
 
        """If self and other have not diverged, ensure self has all the
699
 
        revisions in other
700
 
 
 
698
        """Pull in all new revisions from other branch.
 
699
        
701
700
        >>> from bzrlib.commit import commit
702
701
        >>> bzrlib.trace.silent = True
703
702
        >>> br1 = ScratchBranch(files=['foo', 'bar'])