~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: Alexander Belchenko
  • Date: 2007-11-19 22:54:30 UTC
  • mfrom: (3006 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3008.
  • Revision ID: bialix@ukr.net-20071119225430-x0ewosrsagis0yno
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
914
914
                    if (entry[1][0][0], entry[1][1][0]) in dead_patterns:
915
915
                        deleted_positions.append(pos)
916
916
                if deleted_positions:
917
 
                    if len(deleted_positions) == len(block):
 
917
                    if len(deleted_positions) == len(block[1]):
918
918
                        del block[1][:]
919
919
                    else:
920
920
                        for pos in reversed(deleted_positions):