← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Robert Collins
  • Date: 2009-03-23 03:07:13 UTC
  • mto: This revision was merged to the branch mainline in revision 4183.
  • Revision ID: robertc@robertcollins.net-20090323030713-o0xmije7v3w07ujy
Fix bug with merges of new files, increasing test coverage to ensure its kept fixed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
668
668
                        heads.append(head_candidate)
669
669
                        head_set.remove(head_candidate)
670
670
                carried_over = False
671
 
                if len(heads) == 1 and len(head_candidates) > 1:
 
671
                if len(heads) == 1:
672
672
                    # Could be a carry-over situation:
673
673
                    parent_entry = parent_entries[file_id].get(heads[0], None)
674
674
                    if parent_entry is None: