← 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: 2006-05-17 13:03:45 UTC
  • mfrom: (1551.6.20 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20060517130345-d45c52df5faef54c
Fix pending-merge status on trees with no commits

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: