← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Fixed executability conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
609
609
        # There must be a None in here, if we have a conflict, but we
610
610
        # need executability since file status was not deleted.
611
611
            if self.other_tree.is_executable(file_id) is None:
612
 
                winner == "this"
 
612
                winner = "this"
613
613
            else:
614
 
                winner == "other"
 
614
                winner = "other"
615
615
        if winner == "this":
616
616
            if file_status == "modified":
617
617
                executability = self.this_tree.is_executable(file_id)