← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Merge pt1 hooks branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
644
644
        winner_tid = tt.trans_id_tree_path(winner_path)
645
645
        winner_parent_tid = tt.get_tree_parent(winner_tid)
646
646
        # Switch the paths to preserve the content
647
 
        tt.adjust_path(self.path, winner_parent_tid, winner_tid)
648
 
        tt.adjust_path(winner_path, item_parent_tid, item_tid)
 
647
        tt.adjust_path(osutils.basename(self.path),
 
648
                       winner_parent_tid, winner_tid)
 
649
        tt.adjust_path(osutils.basename(winner_path), item_parent_tid, item_tid)
649
650
        # Associate the file_id to the right content
650
651
        tt.unversion_file(item_tid)
651
652
        tt.version_file(self.file_id, winner_tid)
755
756
        pass
756
757
 
757
758
    def action_take_other(self, tree):
758
 
        # FIXME: We shouldn't have to manipulate so many paths here (and there
759
 
        # is probably a bug or two...)
760
 
        base_path = osutils.basename(self.path)
761
 
        conflict_base_path = osutils.basename(self.conflict_path)
762
759
        tt = transform.TreeTransform(tree)
763
760
        try:
764
761
            p_tid = tt.trans_id_file_id(self.file_id)
765
762
            parent_tid = tt.get_tree_parent(p_tid)
766
763
            cp_tid = tt.trans_id_file_id(self.conflict_file_id)
767
764
            cparent_tid = tt.get_tree_parent(cp_tid)
768
 
            tt.adjust_path(base_path, cparent_tid, cp_tid)
769
 
            tt.adjust_path(conflict_base_path, parent_tid, p_tid)
 
765
            tt.adjust_path(osutils.basename(self.path), cparent_tid, cp_tid)
 
766
            tt.adjust_path(osutils.basename(self.conflict_path),
 
767
                           parent_tid, p_tid)
770
768
            tt.apply()
771
769
        finally:
772
770
            tt.finalize()