← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2006-06-29 06:11:38 UTC
  • mto: This revision was merged to the branch mainline in revision 1825.
  • Revision ID: aaron.bentley@utoronto.ca-20060629061138-6230b820695698b0
Merge handles contents + executable + deletion conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
693
693
        if winner == "conflict":
694
694
        # There must be a None in here, if we have a conflict, but we
695
695
        # need executability since file status was not deleted.
696
 
            if self.other_tree.is_executable(file_id) is None:
 
696
            if self.executable(self.other_tree, file_id) is None:
697
697
                winner = "this"
698
698
            else:
699
699
                winner = "other"