« back to all changes in this revision
Viewing changes to bzrlib/merge_directive.py
- Committer: James Westby
- Date: 2008-07-12 00:52:42 UTC
- mto: (3592.1.1 ianc-integration)
- mto: This revision was merged to the branch mainline in revision 3594.
- Revision ID: jw+debian@jameswestby.net-20080712005242-evds1umvhyshu7er
Handle something that isn't a branch being specified in target_branch.
It's possible to create a merge directive where the target_branch isn't
a branch by the time that it gets to be merged, either because it uses
a local path not on the system where it is being merged, or the branch
has been deleted.
If this is the case and the target_branch needs to be consulted to
retrieve missing revisions then a NotBranchError was raised, which
was quite confusing. This provides a more precise error in that case.
It's possible to create a merge directive where the target_branch isn't
a branch by the time that it gets to be merged, either because it uses
a local path not on the system where it is being merged, or the branch
has been deleted.
If this is the case and the target_branch needs to be consulted to
retrieve missing revisions then a NotBranchError was raised, which
was quite confusing. This provides a more precise error in that case.
added
removed
bzrlib/merge_directive.py
