/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/plugins/git/refs.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 15:47:10 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708154710-zebexq602tcer8hv
Fix more merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/refs.py
204
204
        else:
205
205
            base[k] = v
206
206
            peeled[k] = v
207
 
    for n in set(base.keys() + peeled.keys()):
 
207
    all_keys = set()
 
208
    all_keys.update(base.keys())
 
209
    all_keys.update(peeled.keys())
 
210
    for n in all_keys:
208
211
        try:
209
212
            tag_name = ref_to_tag_name(n)
210
213
        except ValueError: