Merge lp://qastaging/~anj/bzr-keywords/fix-505038 into lp://qastaging/bzr-keywords
Proposed by
Andrew Johnson
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Jelmer Vernooij | ||||
| Approved revision: | 18 | ||||
| Merged at revision: | 17 | ||||
| Proposed branch: | lp://qastaging/~anj/bzr-keywords/fix-505038 | ||||
| Merge into: | lp://qastaging/bzr-keywords | ||||
| Diff against target: |
72 lines (+14/-6) 2 files modified
__init__.py (+12/-5) tests/test_conversion.py (+2/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~anj/bzr-keywords/fix-505038 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jelmer Vernooij (community) | code | Approve | |
| Ian Clatworthy | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch causes the compress_keywords() function to avoid compressing keywords that are not found in the keyword registry. The expand_keywords() code already knows not to touch them. Includes a modification to the test suite.
This fixes bug #505038.
To post a comment you must log in.
Revision history for this message
| Jelmer Vernooij (jelmer) | # |
review:
Approve
(code)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
