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

  • Committer: Jelmer Vernooij
  • Date: 2018-03-04 20:28:19 UTC
  • mfrom: (0.200.1807 work)
  • mto: (0.200.1808 work)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180304202819-0dg57zuugpddt0ie
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
237
237
        bzr_refs = {}
238
238
        refs = {}
239
239
        for k in self.target._git.refs.allkeys():
240
 
            v = self.target._git.refs[k]
 
240
            try:
 
241
                v = self.target._git.refs[k]
 
242
            except KeyError:
 
243
                # broken symref?
 
244
                continue
241
245
            try:
242
246
                for (kind, type_data) in self.source_store.lookup_git_sha(v):
243
247
                    if kind == "commit" and self.source.has_revision(type_data[0]):