Merge lp://qastaging/~vila/bzr-update-copyright/506041-copyright-5-first-lines into lp://qastaging/bzr-update-copyright

Proposed by Vincent Ladeuil
Status: Merged
Merged at revision: 13
Proposed branch: lp://qastaging/~vila/bzr-update-copyright/506041-copyright-5-first-lines
Merge into: lp://qastaging/bzr-update-copyright
Diff against target: 101 lines (+46/-7)
3 files modified
__init__.py (+1/-2)
test_update_copyright.py (+31/-0)
update_copyright.py (+14/-5)
To merge this branch: bzr merge lp://qastaging/~vila/bzr-update-copyright/506041-copyright-5-first-lines
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+215101@code.qastaging.launchpad.net

Commit message

Support copyright line in the 5 first lines of the project.

Description of the change

This fix allows the copyright lines to be in the 5 first lines of a file.

It also fixes compatibility with recent bzr versions.

I've been using this fix for quite some time now (uncommitted in my local version, bad vila ;)

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

Forget the compatibility bit, I didn't noticed the same fix was already in trunk (which I discovered when fixing the conflicts ;-)

14. By Vincent Ladeuil

Merge trunk resolving conflicts.

Revision history for this message
John A Meinel (jameinel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches