/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 bzrlib/reconcile.py

  • Committer: Andrew Bennetts
  • Date: 2007-10-26 06:58:43 UTC
  • mto: This revision was merged to the branch mainline in revision 2945.
  • Revision ID: andrew.bennetts@canonical.com-20071026065843-zof5jrpbfic8cmxl
Tweaks suggested by review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
388
388
                vf.versions(), revision_versions)
389
389
            versions_with_bad_parents, dangling_file_versions = \
390
390
                vf_checker.check_file_version_parents(vf, file_id)
 
391
            if (len(versions_with_bad_parents) == 0 and
 
392
                len(dangling_file_versions) == 0):
 
393
                continue
391
394
            full_text_versions = set()
392
395
            unused_versions = set()
393
 
            if (len(versions_with_bad_parents) == 0 and
394
 
                len(dangling_file_versions) == 0):
395
 
                continue
396
396
            for dangling_version in dangling_file_versions:
397
397
                version = dangling_version[1]
398
398
                if dangling_version in used_file_versions: