← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-20 22:23:07 UTC
  • mfrom: (2363.2.5 dirstate_93681)
  • Revision ID: pqm@pqm.ubuntu.com-20070320222307-30c846e90ac18c65
(John Arbash Meinel) fix bug #93681 by not calling _make_absent for removed entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1169
1169
                entry_index = 0
1170
1170
                while entry_index < len(block[1]):
1171
1171
                    # Mark this file id as having been removed
1172
 
                    ids_to_unversion.discard(block[1][entry_index][0][2])
1173
 
                    if not state._make_absent(block[1][entry_index]):
 
1172
                    entry = block[1][entry_index]
 
1173
                    ids_to_unversion.discard(entry[0][2])
 
1174
                    if (entry[1][0][0] == 'a'
 
1175
                        or not state._make_absent(entry)):
1174
1176
                        entry_index += 1
1175
1177
                # go to the next block. (At the moment we dont delete empty
1176
1178
                # dirblocks)