← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
350
350
            self.cook_conflicts(fs_conflicts)
351
351
            for line in conflicts_strings(self.cooked_conflicts):
352
352
                warning(line)
353
 
            self.tt.apply()
 
353
            results = self.tt.apply()
354
354
        finally:
355
355
            try:
356
356
                self.tt.finalize()
357
357
            except:
358
358
                pass
359
 
       
 
359
        self.write_modified(results)
 
360
 
 
361
    def write_modified(self, results):
 
362
        modified_hashes = {}
 
363
        for path in results.modified_paths:
 
364
            file_id = self.this_tree.path2id(self.this_tree.relpath(path))
 
365
            if file_id is None:
 
366
                continue
 
367
            hash = self.this_tree.get_file_sha1(file_id)
 
368
            if hash is None:
 
369
                continue
 
370
            modified_hashes[file_id] = hash
 
371
        self.this_tree.set_merge_modified(modified_hashes)
 
372
 
360
373
    @staticmethod
361
374
    def parent(entry, file_id):
362
375
        """Determine the parent for a file_id (used as a key method)"""