← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: Martin Pool
  • Date: 2005-07-11 23:13:33 UTC
  • Revision ID: mbp@sourcefrog.net-20050711231333-4e73c6333b8d8213
- merge aaron's merge-rename fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
17
17
import errno
18
18
import patch
19
19
import stat
 
20
from bzrlib.trace import mutter
20
21
"""
21
22
Represent and apply a changeset
22
23
"""
693
694
        :type reverse: bool
694
695
        :rtype: str
695
696
        """
 
697
        mutter("Finding new path for %s" % self.summarize_name(changeset))
696
698
        if reverse:
697
699
            parent = self.parent
698
700
            to_dir = self.dir
717
719
        if from_dir == to_dir:
718
720
            dir = os.path.dirname(id_map[self.id])
719
721
        else:
 
722
            mutter("path, new_path: %r %r" % (self.path, self.new_path))
720
723
            parent_entry = changeset.entries[parent]
721
724
            dir = parent_entry.get_new_path(id_map, changeset, reverse)
722
725
        if from_name == to_name: