← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: Robert Collins
  • Date: 2005-09-14 08:32:23 UTC
  • mfrom: (1092.3.3)
  • mto: This revision was merged to the branch mainline in revision 1397.
  • Revision ID: robertc@robertcollins.net-20050914083223-2474989d25b36154
merge from symlink branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
203
203
    tree_entry = tree.tree.inventory[entry.id]
204
204
    if tree_entry.kind == "file":
205
205
        return changeset.FileCreate(tree.get_file(entry.id).read())
 
206
    elif tree_entry.kind == "symlink":
 
207
        return changeset.SymlinkCreate(tree.get_symlink_target(entry.id))
206
208
    else:
207
209
        assert tree_entry.kind in ("root_directory", "directory")
208
210
        return changeset.dir_create