Merge lp://qastaging/~raoul-snyman/openlp/bug-1557514 into lp://qastaging/openlp

Proposed by Raoul Snyman
Status: Merged
Merged at revision: 2654
Proposed branch: lp://qastaging/~raoul-snyman/openlp/bug-1557514
Merge into: lp://qastaging/openlp
Diff against target: 294 lines (+139/-28)
4 files modified
.bzrignore (+1/-0)
openlp/plugins/songs/lib/db.py (+1/-1)
openlp/plugins/songs/lib/importers/openlp.py (+61/-27)
tests/functional/openlp_plugins/songs/test_openlpimporter.py (+76/-0)
To merge this branch: bzr merge lp://qastaging/~raoul-snyman/openlp/bug-1557514
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Tomas Groth Pending
Review via email: mp+293176@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-04-27.

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Tim Bentley (trb143) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

Missing test!

review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Darn, forgot to add the file.

Revision history for this message
Tim Bentley (trb143) :
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.