← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: John Arbash Meinel
  • Date: 2008-08-08 02:10:19 UTC
  • mfrom: (3613 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3615.
  • Revision ID: john@arbash-meinel.com-20080808021019-e08to54j55sumn1g
Merge bzr.dev 3613, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
210
210
                except errors.RevisionNotPresent:
211
211
                    # At least one dependency isn't present.  Try installing
212
212
                    # missing revisions from the submit branch
213
 
                    submit_branch = _mod_branch.Branch.open(self.target_branch)
 
213
                    try:
 
214
                        submit_branch = \
 
215
                            _mod_branch.Branch.open(self.target_branch)
 
216
                    except errors.NotBranchError:
 
217
                        raise errors.TargetNotBranch(self.target_branch)
214
218
                    missing_revisions = []
215
219
                    bundle_revisions = set(r.revision_id for r in
216
220
                                           info.real_revisions)