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

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/branch.py
1254
1254
        if stop_revision is None:
1255
1255
            (stop_revno, stop_revision) = self.source.last_revision_info()
1256
1256
        elif stop_revno is None:
1257
 
            stop_revno = self.source.revision_id_to_revno(stop_revision)
 
1257
            try:
 
1258
                stop_revno = self.source.revision_id_to_revno(stop_revision)
 
1259
            except errors.NoSuchRevision:
 
1260
                stop_revno = None
1258
1261
        if not isinstance(stop_revision, bytes):
1259
1262
            raise TypeError(stop_revision)
1260
1263
        main_ref = self.target.ref