← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Robert Collins
  • Date: 2007-11-18 19:56:39 UTC
  • mfrom: (3006 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3038.
  • Revision ID: robertc@robertcollins.net-20071118195639-m6zf3d5ljjw88kkn
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
463
463
            # properly, we do not filter down to that
464
464
            # if inserted not in version_ids: continue
465
465
            if line[-1] != '\n':
466
 
                yield line + '\n'
 
466
                yield line + '\n', inserted
467
467
            else:
468
 
                yield line
 
468
                yield line, inserted
469
469
 
470
470
    def _walk_internal(self, version_ids=None):
471
471
        """Helper method for weave actions."""