Merge lp://staging/~jelmer/bzr/2.3-feature-flags into lp://staging/bzr/2.3
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Approved by: | Jelmer Vernooij |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 5666 |
| Proposed branch: | lp://staging/~jelmer/bzr/2.3-feature-flags |
| Merge into: | lp://staging/bzr/2.3 |
| Diff against target: |
139 lines (+72/-1) 6 files modified
bzrlib/branch.py (+2/-1) bzrlib/bzrdir.py (+27/-0) bzrlib/errors.py (+19/-0) bzrlib/repository.py (+1/-0) bzrlib/tests/test_bzrdir.py (+22/-0) bzrlib/workingtree.py (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~jelmer/bzr/2.3-feature-flags |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| bzr-core | Pending | ||
|
Review via email:
|
|||
Commit message
Add basic support for feature flags.
Description of the change
Add basic support for feature flags to the 2.3 release series.
This does the bare minimum to:
* ignore optional feature flags
* raise an appropriate error (non-confusing) for any other feature flags
To post a comment you must log in.
Revision history for this message
| Jelmer Vernooij (jelmer) wrote | # |
Revision history for this message
| Jelmer Vernooij (jelmer) wrote | # |
Revision history for this message
| Jelmer Vernooij (jelmer) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Marking approved, simply merging up from 2.1.