← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-08-08 00:24:38 UTC
  • mfrom: (1907.1.9 no-special-root)
  • Revision ID: pqm@pqm.ubuntu.com-20060808002438-4b8baf2d9282e154
Represent root entries using InventoryDirectory, not RootEntry

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
516
516
            if file_id not in tree:
517
517
                return (None, None)
518
518
            kind = tree.kind(file_id)
519
 
            if kind == "root_directory":
520
 
                kind = "directory"
521
519
            if kind == "file":
522
520
                contents = tree.get_file_sha1(file_id)
523
521
            elif kind == "symlink":