← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Ian Clatworthy
  • Date: 2007-09-20 01:18:47 UTC
  • mfrom: (2825.4.1 knit-index-propogation)
  • mto: This revision was merged to the branch mainline in revision 2836.
  • Revision ID: ian.clatworthy@internode.on.net-20070920011847-mxya10w42px03fw2
No longer propagate index differences automatically (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
1202
1202
        if self.target.versions() == [] and version_ids is None:
1203
1203
            self.target._copy_weave_content(self.source)
1204
1204
            return
1205
 
        try:
1206
 
            self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1207
 
        except errors.WeaveParentMismatch:
1208
 
            self.target._reweave(self.source, pb, msg)
 
1205
        self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1209
1206
 
1210
1207
 
1211
1208
InterVersionedFile.register_optimiser(InterWeave)