/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/tests/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:06:46 UTC
  • mfrom: (6673 work)
  • mto: This revision was merged to the branch mainline in revision 6675.
  • Revision ID: jelmer@jelmer.uk-20170610000646-xj6jh277lo4xuo10
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge.py
1043
1043
 
1044
1044
    def assertPruneTails(self, pruned_map, tails, parent_map):
1045
1045
        child_map = {}
1046
 
        for key, parent_keys in parent_map.iteritems():
 
1046
        for key, parent_keys in parent_map.items():
1047
1047
            child_map.setdefault(key, [])
1048
1048
            for pkey in parent_keys:
1049
1049
                child_map.setdefault(pkey, []).append(key)