← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-20 08:10:24 UTC
  • mfrom: (2637.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070720081024-5xhlp7r8ufwxt6nf
(Kent Gibson) Update update's help

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