~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-04-26 21:11:03 UTC
  • mfrom: (2447.1.7 bundle_empty_properties)
  • Revision ID: pqm@pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
(John Arbash Meinel) Fix bug #109613 by teaching Bundle how to properly read/write revision properties with no value.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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,
198
 
                                                        topo_sorted=False))
 
197
            ignore = set(branch.repository.get_ancestry(last_revision))
199
198
        except errors.NoSuchRevision:
200
199
            # the last revision is a ghost : assume everything is new 
201
200
            # except for it