← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

Merge from aaron. Whee, we are synced. Yay. Begone the foul demons of merge conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
91
91
                print >>to_file, 'pending merges:'
92
92
                last_revision = branch.last_revision()
93
93
                if last_revision is not None:
94
 
                    ignore = set(branch.get_ancestry(last_revision))
 
94
                    ignore = set(branch.storage.get_ancestry(last_revision))
95
95
                else:
96
96
                    ignore = set()
97
97
                for merge in new.pending_merges():
99
99
                    try:
100
100
                        m_revision = branch.storage.get_revision(merge)
101
101
                        print >> to_file, ' ', line_log(m_revision, 77)
102
 
                        inner_merges = branch.get_ancestry(merge)
 
102
                        inner_merges = branch.storage.get_ancestry(merge)
103
103
                        inner_merges.reverse()
104
104
                        for mmerge in inner_merges:
105
105
                            if mmerge in ignore: