← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-08-19 15:25:36 UTC
  • mfrom: (3640.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080819152536-6oobtmrum8e34h8l
(jam) Merge in bzr-1.6rc4 including the fix for bug #256757

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 = []