← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Vincent Ladeuil
  • Date: 2011-01-15 17:29:41 UTC
  • mfrom: (5050.62.2 2.2)
  • mto: (5609.2.3 2.3)
  • mto: This revision was merged to the branch mainline in revision 5615.
  • Revision ID: v.ladeuil+lp@free.fr-20110115172941-ukpq0aseczd5g0o7
Merge 2.2 into 2.3 including fix for bug #660935

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
514
514
        # Adjust the path for the retained file id
515
515
        tid = tt.trans_id_file_id(file_id)
516
516
        parent_tid = tt.get_tree_parent(tid)
517
 
        tt.adjust_path(path, parent_tid, tid)
 
517
        tt.adjust_path(osutils.basename(path), parent_tid, tid)
518
518
        tt.apply()
519
519
 
520
520
    def _revision_tree(self, tree, revid):
600
600
        # 'item.suffix_to_remove' has been deleted, this is a no-op)
601
601
        this_tid = tt.trans_id_file_id(self.file_id)
602
602
        parent_tid = tt.get_tree_parent(this_tid)
603
 
        tt.adjust_path(self.path, parent_tid, this_tid)
 
603
        tt.adjust_path(osutils.basename(self.path), parent_tid, this_tid)
604
604
        tt.apply()
605
605
 
606
606
    def action_take_this(self, tree):