← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: Aaron Bentley
  • Date: 2005-08-10 21:43:27 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: abentley@panoramicfeedback.com-20050810214327-4e8c22e4cba24527
Eliminated ThreeWayInventory

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
999
999
    def rename_conflict(self, id, this_name, base_name, other_name):
1000
1000
        raise RenameConflict(id, this_name, base_name, other_name)
1001
1001
 
1002
 
    def move_conflict(self, id, inventory):
1003
 
        this_dir = inventory.this.get_dir(id)
1004
 
        base_dir = inventory.base.get_dir(id)
1005
 
        other_dir = inventory.other.get_dir(id)
 
1002
    def move_conflict(self, id, this_dir, base_dir, other_dir):
1006
1003
        raise MoveConflict(id, this_dir, base_dir, other_dir)
1007
1004
 
1008
1005
    def merge_conflict(self, new_file, this_path, base_path, other_path):
1039
1036
    def missing_for_rename(self, filename):
1040
1037
        raise MissingForRename(filename)
1041
1038
 
1042
 
    def missing_for_merge(self, file_id, inventory):
1043
 
        raise MissingForMerge(inventory.other.get_path(file_id))
 
1039
    def missing_for_merge(self, file_id, other_path):
 
1040
        raise MissingForMerge(other_path)
1044
1041
 
1045
1042
    def new_contents_conflict(self, filename, other_contents):
1046
1043
        raise NewContentsConflict(filename)