← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

[merge] much integrated work from robert and john

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
87
87
            unknowns = new.unknowns()
88
88
            list_paths('unknown', unknowns, specific_files, to_file)
89
89
            list_paths('conflicts', conflicts, specific_files, to_file)
90
 
            if show_pending and len(branch.pending_merges()) > 0:
 
90
            if show_pending and len(new.pending_merges()) > 0:
91
91
                print >>to_file, 'pending merges:'
92
92
                last_revision = branch.last_revision()
93
93
                if last_revision is not None:
94
94
                    ignore = set(branch.get_ancestry(last_revision))
95
95
                else:
96
96
                    ignore = set()
97
 
                for merge in branch.pending_merges():
 
97
                for merge in new.pending_merges():
98
98
                    ignore.add(merge)
99
99
                    try:
100
100
                        m_revision = branch.get_revision(merge)