/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-12 09:58:01 UTC
  • mfrom: (7029.4.9 python3-merge)
  • Revision ID: breezy.the.bot@gmail.com-20180712095801-59ffq76qu4wou2ab
Fix some merge tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-merge/+merge/349097

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().union(base.keys(), peeled.keys())
 
208
    for n in all_keys:
208
209
        try:
209
210
            tag_name = ref_to_tag_name(n)
210
211
        except ValueError: