← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Aaron Bentley
  • Date: 2007-03-11 01:22:51 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2342.
  • Revision ID: aaron.bentley@utoronto.ca-20070311012251-pf1lg4uhb5s4qs3n
Use public location of submit branch if possible

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
193
193
        used for the commit.
194
194
        """
195
195
        t = testament.StrictTestament3.from_revision(repository, revision_id)
 
196
        submit_branch = _mod_branch.Branch.open(target_branch)
 
197
        if submit_branch.get_public_branch() is not None:
 
198
            target_branch = submit_branch.get_public_branch()
196
199
        if patch_type is None:
197
200
            patch = None
198
201
        else:
199
 
            submit_branch = _mod_branch.Branch.open(target_branch)
200
202
            submit_revision_id = submit_branch.last_revision()
201
203
            repository.fetch(submit_branch.repository, submit_revision_id)
202
204
            ancestor_id = _mod_revision.common_ancestor(revision_id,