← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
1195
1195
                    current_source = key_source
1196
1196
                source_keys[-1][1].append(key)
1197
1197
        else:
 
1198
            if ordering != 'unordered':
 
1199
                raise AssertionError('valid values for ordering are:'
 
1200
                    ' "unordered" or "topological" not: %r'
 
1201
                    % (ordering,))
1198
1202
            # Just group by source; remote sources first.
1199
1203
            present_keys = []
1200
1204
            source_keys = []