← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Wouter van Heyst
  • Date: 2006-06-06 12:06:20 UTC
  • mfrom: (1740 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: larstiq@larstiq.dyndns.org-20060606120620-50066b0951e4ef7c
merge bzr.dev 1740

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
164
164
    if last_revision is not None:
165
165
        ignore = set(branch.repository.get_ancestry(last_revision))
166
166
    else:
167
 
        ignore = set()
 
167
        ignore = set([None])
168
168
    for merge in new.pending_merges():
169
169
        ignore.add(merge)
170
170
        try:
171
171
            m_revision = branch.repository.get_revision(merge)
172
172
            print >> to_file, ' ', line_log(m_revision, 77)
173
173
            inner_merges = branch.repository.get_ancestry(merge)
 
174
            assert inner_merges[0] == None
 
175
            inner_merges.pop(0)
174
176
            inner_merges.reverse()
175
177
            for mmerge in inner_merges:
176
178
                if mmerge in ignore: