← 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

Merge lp:bzr.

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 (
 
24
    debug,
 
25
    merge,
 
26
    urlutils,
 
27
    )
25
28
from bzrlib.merge3 import Merge3
26
29
from bzrlib.trace import mutter
27
30
 
71
74
        :param params: A MergeHookParams describing the file to merge
72
75
        :param tree: a Tree, e.g. self.merger.this_tree.
73
76
        """
74
 
        return tree.inventory[params.file_id].name
 
77
        return urlutils.basename(tree.id2path(params.file_id))
75
78
 
76
79
    def merge_text(self, params):
77
80
        """Merge changelog changes.