← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Andrew Bennetts
  • Date: 2007-09-28 04:40:46 UTC
  • mto: This revision was merged to the branch mainline in revision 2905.
  • Revision ID: andrew.bennetts@canonical.com-20070928044046-fyl5mq8gszi78g5y
Deprecate revision_ids arg to Repository.check and other tweaks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
373
373
                self.transaction)
374
374
            new_parents = {}
375
375
            for version in vf.versions():
376
 
                parents = vf.get_parents(version)
377
376
                if version in versions_with_bad_parents:
378
377
                    parents = versions_with_bad_parents[version][1]
 
378
                else:
 
379
                    parents = vf.get_parents(version)
379
380
                new_parents[version] = parents
380
381
            for version in topo_sort(new_parents.items()):
381
382
                new_vf.add_lines(version, new_parents[version],