← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Martin Pool
  • Date: 2010-02-25 06:17:27 UTC
  • mfrom: (5055 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5057.
  • Revision ID: mbp@sourcefrog.net-20100225061727-4sd9lt0qmdc6087t
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
1
 
# Copyright (C) 2009 Canonical Ltd
 
1
# Copyright (C) 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
from bzrlib import (
21
21
    bzrdir,
22
22
    errors,
23
 
    merge_directive,
24
23
    osutils,
25
24
    registry,
26
25
    trace,
150
149
 
151
150
def _send_4(branch, revision_id, submit_branch, public_branch,
152
151
            no_patch, no_bundle, message, base_revision_id):
 
152
    from bzrlib import merge_directive
153
153
    return merge_directive.MergeDirective2.from_objects(
154
154
        branch.repository, revision_id, time.time(),
155
155
        osutils.local_time_offset(), submit_branch,
171
171
            patch_type = 'diff'
172
172
        else:
173
173
            patch_type = None
 
174
    from bzrlib import merge_directive
174
175
    return merge_directive.MergeDirective.from_objects(
175
176
        branch.repository, revision_id, time.time(),
176
177
        osutils.local_time_offset(), submit_branch,