← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2008-03-07 18:17:13 UTC
  • mto: This revision was merged to the branch mainline in revision 3255.
  • Revision ID: aaron@aaronbentley.com-20080307181713-gq97309x7jnbvs67
Use nick/revno-based names for merge directives

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4167
4167
                else:
4168
4168
                    revision = branch.repository.get_revision(revision_id)
4169
4169
                    subject += revision.get_summary()
 
4170
                basename = directive.get_disk_name(branch)
4170
4171
                mail_client.compose_merge_request(mail_to, subject,
4171
 
                                                  outfile.getvalue())
 
4172
                                                  outfile.getvalue(), basename)
4172
4173
        finally:
4173
4174
            if output != '-':
4174
4175
                outfile.close()