← 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: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

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