← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-12 08:40:15 UTC
  • mfrom: (1651.1.7 bzr.mbp.escape-stores)
  • Revision ID: pqm@pqm.ubuntu.com-20060412084015-e6472a0717edbca6
(mbp) storage escaping, cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
282
282
        for file_id in old_entries:
283
283
            entry = old_entries[file_id]
284
284
            path = id2path(file_id)
 
285
            if file_id in self.base_tree.inventory:
 
286
                executable = getattr(self.base_tree.inventory[file_id], 'executable', False)
 
287
            else:
 
288
                executable = getattr(entry, 'executable', False)
285
289
            new_inventory[file_id] = (path, file_id, entry.parent_id, 
286
 
                                      entry.kind)
 
290
                                      entry.kind, executable)
 
291
                                      
287
292
            by_path[path] = file_id
288
293
        
289
294
        deletions = 0
306
311
                parent = by_path[os.path.dirname(path)]
307
312
            abspath = pathjoin(self.this_tree.basedir, path)
308
313
            kind = bzrlib.osutils.file_kind(abspath)
309
 
            new_inventory[file_id] = (path, file_id, parent, kind)
 
314
            if file_id in self.base_tree.inventory:
 
315
                executable = getattr(self.base_tree.inventory[file_id], 'executable', False)
 
316
            else:
 
317
                executable = False
 
318
            new_inventory[file_id] = (path, file_id, parent, kind, executable)
310
319
            by_path[path] = file_id 
311
320
 
312
321
        # Get a list in insertion order