~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
399
399
            pending = set()
400
400
            for version, parents in self.iter_parents(this_iteration):
401
401
                result[version] = parents
402
 
                pending.update(parents)
403
 
            pending.difference_update(result)
 
402
                for parent in parents:
 
403
                    if parent in result:
 
404
                        continue
 
405
                    pending.add(parent)
404
406
        return result
405
407
 
406
408
    def get_graph_with_ghosts(self):