← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Aaron Bentley
  • Date: 2005-10-24 00:51:15 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1488.
  • Revision ID: aaron.bentley@utoronto.ca-20051024005115-11eb6ff177fc195d
Improved sort order of indirect merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
99
99
                    try:
100
100
                        m_revision = branch.get_revision(merge)
101
101
                        print >> to_file, ' ', line_log(m_revision, 77)
102
 
                        inner_merges = set(branch.get_ancestry(merge))\
103
 
                            - ignore
 
102
                        inner_merges = branch.get_ancestry(merge)
 
103
                        inner_merges.reverse()
104
104
                        for mmerge in inner_merges:
 
105
                            if mmerge in ignore:
 
106
                                continue
105
107
                            mm_revision = branch.get_revision(mmerge)
106
108
                            print >> to_file, '   ', line_log(mm_revision, 75)
107
 
                        ignore.update(inner_merges)
 
109
                            ignore.add(mmerge)
108
110
                            
109
111
                    except NoSuchRevision:
110
112
                        print >> to_file, ' ', merge