← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Martin Pool
  • Date: 2005-10-05 03:02:27 UTC
  • mto: (1185.13.3)
  • mto: This revision was merged to the branch mainline in revision 1403.
  • Revision ID: mbp@sourcefrog.net-20051005030227-8a38be85b9714d9b
- Add stub Weave.join() method

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
739
739
                       state
740
740
 
741
741
                
 
742
    def join(self, other):
 
743
        """Integrate versions from other into this weave.
 
744
 
 
745
        The resulting weave contains all the history of both weaves; any version you 
 
746
        could retrieve from either self or other can be retrieved from self after
 
747
        this call.
 
748
 
 
749
        It is illegal for the two weaves to contain different values for any version.
 
750
        """
 
751
        if other.numversions() == 0:
 
752
            return          # nothing to update, easy
 
753
        raise NotImplementedError()
742
754
 
743
755
 
744
756