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

Cope with tuples in refs dictionary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
701
701
            refs.update(new_refs)
702
702
            return refs
703
703
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
704
 
        result.old_revid = self.target.lookup_foreign_revision_id(
705
 
            old_refs.get(main_ref, ZERO_SHA))
 
704
        (result.old_revid, old_sha1) = old_refs.get(main_ref, (ZERO_SHA, NULL_REVISION))
 
705
        if result.old_revid is None:
 
706
            result.old_revid = self.target.lookup_foreign_revision_id(old_sha1)
706
707
        result.new_revid = new_refs[main_ref]
707
708
        return result
708
709