/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/status.py

Teach status to handle the base revision being a ghost.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
159
159
    last_revision = parents[0]
160
160
    print >>to_file, 'pending merges:'
161
161
    if last_revision is not None:
162
 
        ignore = set(branch.repository.get_ancestry(last_revision))
 
162
        try:
 
163
            ignore = set(branch.repository.get_ancestry(last_revision))
 
164
        except errors.NoSuchRevision:
 
165
            # the last revision is a ghost : assume everything is new 
 
166
            # except for it
 
167
            ignore = set([None, last_revision])
163
168
    else:
164
169
        ignore = set([None])
165
170
    # TODO: this could be improved using merge_sorted - we'd get the same