~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Robey Pointer
  • Date: 2006-09-03 00:28:18 UTC
  • mfrom: (1981 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060903002818-71ca5c7bfea93a26
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
364
364
            return None
365
365
        if history is None:
366
366
            history = self.revision_history()
367
 
        elif revno <= 0 or revno > len(history):
 
367
        if revno <= 0 or revno > len(history):
368
368
            raise bzrlib.errors.NoSuchRevision(self, revno)
369
369
        return history[revno - 1]
370
370
 
1234
1234
                        "use bzrlib.urlutils.escape")
1235
1235
                    
1236
1236
            url = urlutils.relative_url(self.base, url)
1237
 
            self.control_files.put('parent', url + '\n')
 
1237
            self.control_files.put('parent', StringIO(url + '\n'))
1238
1238
 
1239
1239
    @deprecated_function(zero_nine)
1240
1240
    def tree_config(self):