Maintain consistency with DHIS2
In order to maintain consistence and not diverge from the main DHIS2 project, our changes should be merged with the main DHIS2 trunk to get the latest changes.
Blueprint information
- Status:
- Complete
- Approver:
- None
- Priority:
- Undefined
- Drafter:
- None
- Direction:
- Needs approval
- Assignee:
- Hans Joachim Desserud
- Definition:
- Approved
- Series goal:
- None
- Implementation:
-
Implemented
- Milestone target:
-
m4-2010
- Started by
- Hans Joachim Desserud
- Completed by
- Hans Joachim Desserud
Whiteboard
Our project should be merged with the main DHIS2 trunk from time to time, to keep updated on the changes done overall, and make sure our changes does not introduce any conflicts or consistencies.
Report from first merge on 26th Nov:
- resolved two conflicts since dhis-web/pom.xml and dhis-web/
- Initially I couldn't get our module (all else worked fine) to run with the database. Turns out the template for hibernate.
Second merge performed on 3rd December:
Merged with DHIS2 trunk r2277 without any issues.
Third merge performed on 10th December: (by anderrb)
Merged with DHIS2 trunk r2332.
Resolved one conflict (changes in PDFutils).
Merging with trunk should be repeated, to ensure our module is working with the current development version of DHIS2. Remerging should be done at least once more before final delivery, and I consider doing it weekly.
Work Items
Dependency tree
* Blueprints in grey have been implemented.
