/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: John Arbash Meinel
  • Date: 2008-09-05 03:11:40 UTC
  • mfrom: (3691 +trunk)
  • mto: (3697.7.4 1.7)
  • mto: This revision was merged to the branch mainline in revision 3748.
  • Revision ID: john@arbash-meinel.com-20080905031140-hj0adlcf30l7i99v
Merge in bzr.dev 3691

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
285
285
                    if len(heads) == 1:
286
286
                        output_append((iter(heads).next(), left[1]))
287
287
                    else:
288
 
                        # Both claim different origins
289
 
                        output_append((revision_id, left[1]))
290
 
                        # We know that revision_id is the head for
291
 
                        # left and right, so cache it
292
 
                        heads_provider.cache(
293
 
                            (revision_id, left[0]),
294
 
                            (revision_id,))
295
 
                        heads_provider.cache(
296
 
                            (revision_id, right[0]),
297
 
                            (revision_id,))
 
288
                        # Both claim different origins, sort lexicographically
 
289
                        # so that we always get a stable result.
 
290
                        output_append(sorted([left, right])[0])
298
291
        last_child_idx = child_idx + match_len
299
292
 
300
293