← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Aaron Bentley
  • Date: 2006-03-07 05:59:14 UTC
  • mfrom: (1558.1.20 Aaron's integration)
  • mto: This revision was merged to the branch mainline in revision 1595.
  • Revision ID: aaron.bentley@utoronto.ca-20060307055914-a88728997afceb90
Merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
279
279
 
280
280
        # if we abort after here the (in-memory) weave will be corrupt because only
281
281
        # some fields are updated
 
282
        # XXX: FIXME implement a succeed-or-fail of the rest of this routine.
 
283
        #      - Robert Collins 20060226
282
284
        self._parents.append(parents[:])
283
285
        self._sha1s.append(sha1)
284
286
        self._names.append(name)
318
320
        # another small special case: a merge, producing the same text
319
321
        # as auto-merge
320
322
        if text == basis_lines:
321
 
            return new_version            
 
323
            return new_version
322
324
 
323
325
        # add a sentinal, because we can also match against the final line
324
326
        basis_lineno.append(len(self._weave))