/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/dirstate.py

  • Committer: Robert Collins
  • Date: 2007-11-18 19:56:39 UTC
  • mfrom: (3006 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3038.
  • Revision ID: robertc@robertcollins.net-20071118195639-m6zf3d5ljjw88kkn
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
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):