← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-07-20 08:56:45 UTC
  • mfrom: (4526.9.23 apply-inventory-delta)
  • Revision ID: pqm@pqm.ubuntu.com-20090720085645-54mtgybxua0yx6hw
(robertc) Add checks for inventory deltas which try to ensure that
        deltas that are not an exact fit are not applied. (Robert
        Collins, bug 397705, bug 367633)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
2079
2079
        self.transform = transform
2080
2080
 
2081
2081
    def _determine_path(self, trans_id):
2082
 
        if trans_id == self.transform.root:
 
2082
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
2083
2083
            return ""
2084
2084
        name = self.transform.final_name(trans_id)
2085
2085
        parent_id = self.transform.final_parent(trans_id)