← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Robert Collins
  • Date: 2007-06-28 02:43:50 UTC
  • mfrom: (2553 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2558.
  • Revision ID: robertc@robertcollins.net-20070628024350-z8bdm0y6yz2uyf4o
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
194
194
        print >>to_file, 'pending merges:'
195
195
    if last_revision is not None:
196
196
        try:
197
 
            ignore = set(branch.repository.get_ancestry(last_revision))
 
197
            ignore = set(branch.repository.get_ancestry(last_revision,
 
198
                                                        topo_sorted=False))
198
199
        except errors.NoSuchRevision:
199
200
            # the last revision is a ghost : assume everything is new 
200
201
            # except for it