← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to weave.py

  • Committer: Martin Pool
  • Date: 2005-06-28 09:32:03 UTC
  • mto: This revision was merged to the branch mainline in revision 852.
  • Revision ID: mbp@sourcefrog.net-20050628093203-4a08f8204d673c1e
Basic implementation of deletion markers

Show diffs side-by-side

added added

removed removed

Lines of Context:
weave.py
269
269
                if not istack:
270
270
                    raise WeaveFormatError("literal at top level on line %d"
271
271
                                           % lineno)
272
 
                isactive = istack[-1] in included
 
272
                isactive = (istack[-1] in included) \
 
273
                           and not included.intersection(dset)
273
274
                if isactive:
274
275
                    origin = istack[-1]
275
276
                    yield origin, lineno, l