~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

(robertc) Deprecate WorkingTree.pending_merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
173
173
    work_inv = working.inventory
174
174
    delta = working.changes_from(basis, want_unchanged=True)
175
175
    history = branch.revision_history()
176
 
    tree_last_id = working.last_revision()
 
176
    try:
 
177
        tree_last_id = working.get_parent_ids()[0]
 
178
    except IndexError:
 
179
        tree_last_id = None
177
180
 
178
181
    if len(history) and tree_last_id != history[-1]:
179
182
        tree_last_revno = branch.revision_id_to_revno(tree_last_id)