/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/annotate.py

  • Committer: Robert Collins
  • Date: 2008-09-02 00:01:34 UTC
  • mfrom: (3671 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3724.
  • Revision ID: robertc@robertcollins.net-20080902000134-qz8r6v1mltygeg6t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
345
345
                    if len(heads) == 1:
346
346
                        output_append((iter(heads).next(), left[1]))
347
347
                    else:
348
 
                        # Both claim different origins
349
 
                        output_append((revision_id, left[1]))
350
 
                        # We know that revision_id is the head for
351
 
                        # left and right, so cache it
352
 
                        heads_provider.cache(
353
 
                            (revision_id, left[0]),
354
 
                            (revision_id,))
355
 
                        heads_provider.cache(
356
 
                            (revision_id, right[0]),
357
 
                            (revision_id,))
 
348
                        # Both claim different origins, sort lexicographically
 
349
                        # so that we always get a stable result.
 
350
                        output_append(sorted([left, right])[0])
358
351
        last_child_idx = child_idx + match_len
359
352
 
360
353