/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: Aaron Bentley
  • Date: 2005-11-24 06:05:20 UTC
  • mto: (1185.33.52 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 1512.
  • Revision ID: aaron.bentley@utoronto.ca-20051124060520-0279acee0f7c1d70
Tweaked tree name generation when applying changesets

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
795
795
                raise SourceRootHasName(self, to_name)
796
796
            else:
797
797
                return '.'
798
 
        if from_dir == to_dir:
 
798
        parent_entry = changeset.entries.get(parent)
 
799
        if parent_entry is None:
799
800
            dir = os.path.dirname(id_map[self.id])
800
801
        else:
801
802
            mutter("path, new_path: %r %r", self.path, self.new_path)
802
 
            parent_entry = changeset.entries[parent]
803
803
            dir = parent_entry.get_new_path(id_map, changeset, reverse)
804
804
        if from_name == to_name:
805
805
            name = os.path.basename(id_map[self.id])