← 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-06 17:38:20 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2330.
  • Revision ID: abentley@panoramicfeedback.com-20070306173820-gm6h3evc1wq5hmcq
Check public branch only if not using a bundle

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
122
122
                patch = klass._generate_diff(repository, revision_id,
123
123
                                             ancestor_id)
124
124
 
125
 
            if public_branch is not None:
 
125
            if public_branch is not None and patch_type != 'bundle':
126
126
                public_branch_obj = _mod_branch.Branch.open(public_branch)
127
127
                if not public_branch_obj.repository.has_revision(revision_id):
128
128
                    raise errors.PublicBranchOutOfDate(public_branch,