← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/changelog_merge/changelog_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 01:35:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124013556-kq6eew03kjqi16rl
Fix more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/changelog_merge/changelog_merge.py
20
20
 
21
21
import difflib
22
22
 
23
 
from bzrlib import merge
24
 
from bzrlib import debug
 
23
from bzrlib import debug, merge, urlutils
25
24
from bzrlib.merge3 import Merge3
26
25
from bzrlib.trace import mutter
27
26
 
71
70
        :param params: A MergeHookParams describing the file to merge
72
71
        :param tree: a Tree, e.g. self.merger.this_tree.
73
72
        """
74
 
        return tree.inventory[params.file_id].name
 
73
        return urlutils.basename(tree.id2path(params.file_id))
75
74
 
76
75
    def merge_text(self, params):
77
76
        """Merge changelog changes.