← Back to branch summary

~bzr/ubuntu/lucid/bzr/beta-ppa

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Max Bowsher
  • Date: 2011-01-21 04:29:28 UTC
  • mfrom: (136.1.9 maverick)
  • Revision ID: maxb@f2s.com-20110121042928-r7c33h7s366vz9s5
Tags: 2.2.3-0~bazaar1~lucid1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
504
504
        # Adjust the path for the retained file id
505
505
        tid = tt.trans_id_file_id(file_id)
506
506
        parent_tid = tt.get_tree_parent(tid)
507
 
        tt.adjust_path(path, parent_tid, tid)
 
507
        tt.adjust_path(osutils.basename(path), parent_tid, tid)
508
508
        tt.apply()
509
509
 
510
510
    def _revision_tree(self, tree, revid):
590
590
        # 'item.suffix_to_remove' has been deleted, this is a no-op)
591
591
        this_tid = tt.trans_id_file_id(self.file_id)
592
592
        parent_tid = tt.get_tree_parent(this_tid)
593
 
        tt.adjust_path(self.path, parent_tid, this_tid)
 
593
        tt.adjust_path(osutils.basename(self.path), parent_tid, this_tid)
594
594
        tt.apply()
595
595
 
596
596
    def action_take_this(self, tree):