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

  • Committer: John Arbash Meinel
  • Date: 2006-06-16 21:05:03 UTC
  • mfrom: (1784 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1785.
  • Revision ID: john@arbash-meinel.com-20060616210503-3d6f8d1e9a6ca5b4
[merge] bzr.dev 1784, fix NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
232
232
    for index, rev_id in cut_revs:
233
233
        rev_nos[rev_id] = index
234
234
 
 
235
    revisions = branch.repository.get_revisions([r for s, r, m, e in
 
236
                                                 merge_sorted_revisions])
 
237
 
235
238
    # now we just print all the revisions
236
 
    for sequence, rev_id, merge_depth, end_of_merge in merge_sorted_revisions:
237
 
        rev = branch.repository.get_revision(rev_id)
 
239
    for ((sequence, rev_id, merge_depth, end_of_merge), rev) in \
 
240
        zip(merge_sorted_revisions, revisions):
238
241
 
239
242
        if searchRE:
240
243
            if not searchRE.search(rev.message):