← 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: Samuel Bronson
  • Date: 2012-08-30 20:36:18 UTC
  • mto: (6015.57.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: naesten@gmail.com-20120830203618-y2dzw91nqpvpgxvx
Update INSTALL for switch to Python 2.6 and up.

Show diffs side-by-side

added added

removed removed

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