/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Robert Collins
  • Date: 2007-09-21 06:10:31 UTC
  • mfrom: (2844 +trunk)
  • mto: (2592.3.144 repository)
  • mto: This revision was merged to the branch mainline in revision 2879.
  • Revision ID: robertc@robertcollins.net-20070921061031-p945q13ra1jjcli2
Merge bzr.dev.

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)