← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Martin Pool
  • Date: 2006-05-19 06:04:00 UTC
  • mfrom: (1714 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1717.
  • Revision ID: mbp@sourcefrog.net-20060519060400-df4657a818d9008a
merge bzr.dev

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: