← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
777
777
                         version in version_ids]
778
778
        for name in topo_sort(pending_graph):
779
779
            other_idx = other._name_map[name]
780
 
            self._check_version_consistent(other, other_idx, name)
781
 
            sha1 = other._sha1s[other_idx]
782
 
 
 
780
            # returns True if we have it, False if we need it.
 
781
            if not self._check_version_consistent(other, other_idx, name):
 
782
                names_to_join.append((other_idx, name))
783
783
            processed += 1
784
784
 
785
 
            if name in self._name_map:
786
 
                idx = self._lookup(name)
787
 
                n1 = set(map(other._idx_to_name, other._parents[other_idx]))
788
 
                n2 = set(map(self._idx_to_name, self._parents[idx]))
789
 
                if sha1 ==  self._sha1s[idx] and n1 == n2:
790
 
                        continue
791
 
 
792
 
            names_to_join.append((other_idx, name))
793
785
 
794
786
        if pb and not msg:
795
787
            msg = 'weave join'