← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: John Arbash Meinel
  • Date: 2008-05-29 19:46:01 UTC
  • mfrom: (3456 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3459.
  • Revision ID: john@arbash-meinel.com-20080529194601-r2gpmk536xin9c4a
merge bzr.dev, put the NEWS entry in the right place

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
226
226
            if fully_present[1] is True:
227
227
                delta.added.append((path[1], file_id, kind[1]))
228
228
            else:
229
 
                assert fully_present[0] is True
230
229
                delta.removed.append((path[0], file_id, kind[0]))
231
230
        elif fully_present[0] is False:
232
231
            continue