← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

Fixed inner merges in status

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
104
104
                        for mmerge in inner_merges:
105
105
                            if mmerge in ignore:
106
106
                                continue
107
 
                            mm_revision = branch.get_revision(mmerge)
 
107
                            mm_revision = branch.storage.get_revision(mmerge)
108
108
                            print >> to_file, '   ', line_log(mm_revision, 75)
109
109
                            ignore.add(mmerge)
110
110