← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Andrew Bennetts
  • Date: 2009-08-25 01:25:57 UTC
  • mfrom: (4642 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4657.
  • Revision ID: andrew.bennetts@canonical.com-20090825012557-1ku5o09nv3ra9n12
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
73
73
        """
74
74
        for (file_id, paths, changed, versioned, parents, names, kind,
75
75
             executable) in self.iter_changes:
 
76
            # don't shelve add of tree root.  Working tree should never
 
77
            # lack roots, and bzr misbehaves when they do.
 
78
            # FIXME ADHB (2009-08-09): should still shelve adds of tree roots
 
79
            # when a tree root was deleted / renamed.
 
80
            if kind[0] is None and names[1] == '':
 
81
                continue
76
82
            if kind[0] is None or versioned[0] == False:
77
83
                self.creation[file_id] = (kind[1], names[1], parents[1],
78
84
                                          versioned)