← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Robert Collins
  • Date: 2005-10-08 00:39:04 UTC
  • mfrom: (1185.1.52)
  • Revision ID: robertc@robertcollins.net-20051008003904-aaffaea2778efe3e
merge in martins reweave, integrated to fetch, and a bugfix for commit and upgrade with executable files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
166
166
                ie = inv[self.file_id]
167
167
                assert ie.file_id == self.file_id
168
168
                if ie.revision in heads:
 
169
                    # fixup logic, there was a bug in revision updates.
 
170
                    # with x bit support.
 
171
                    try:
 
172
                        if heads[ie.revision].executable != ie.executable:
 
173
                            heads[ie.revision].executable = False
 
174
                            ie.executable = False
 
175
                    except AttributeError:
 
176
                        pass
169
177
                    assert heads[ie.revision] == ie
170
178
                else:
171
179
                    # may want to add it.
571
579
            # FIXME: 20050930 probe for the text size when getting sha1
572
580
            # in _read_tree_state
573
581
            self.text_size = previous_ie.text_size
 
582
        if self.executable != previous_ie.executable:
 
583
            compatible = False
574
584
        return compatible
575
585
 
576
586