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

bzrlib.transform.TreeTransform.tree_kind and
bzrlib.transform.TransformPreview.tree_kind also return None instead of
raising NoSuchFile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1397
1397
            self.tt.version_file(file_id, trans_id)
1398
1398
        # The merge has been performed, so the old contents should not be
1399
1399
        # retained.
1400
 
        try:
1401
 
            self.tt.delete_contents(trans_id)
1402
 
        except errors.NoSuchFile:
1403
 
            pass
 
1400
        self.tt.delete_contents(trans_id)
1404
1401
        return result
1405
1402
 
1406
1403
    def _default_other_winner_merge(self, merge_hook_params):