← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Robert Collins
  • Date: 2006-09-17 21:03:04 UTC
  • mfrom: (2018 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2019.
  • Revision ID: robertc@robertcollins.net-20060917210304-3a697132f5fb68ac
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
294
294
 
295
295
    def revision_history(self):
296
296
        """Return sequence of revision hashes on to this branch."""
297
 
        raise NotImplementedError('revision_history is abstract')
 
297
        raise NotImplementedError(self.revision_history)
298
298
 
299
299
    def revno(self):
300
300
        """Return current revision number for this branch.
1185
1185
        try:
1186
1186
            old_count = len(self.revision_history())
1187
1187
            try:
1188
 
                self.update_revisions(source,stop_revision)
 
1188
                self.update_revisions(source, stop_revision)
1189
1189
            except DivergedBranches:
1190
1190
                if not overwrite:
1191
1191
                    raise