Looks like all the code is in... its fine! --- Regards, Saptarshi PURKAYASTHA Director R & D, HISP India Health Information Systems Programme
My Tech Blog: http://sunnytalkstech.blogspot.com You Live by CHOICE, Not by CHANCE On 31 March 2010 18:52, Quang Nguyen <[email protected]> wrote: > Hi all, > > I committed the code of DataValue history function without pulling-up > the latest code from others. > Then I used "bzr merge" to merge my code with 4 newer commit-ions, > committed the merged stuff and pushed them to the server. I'm not sure > if I did something wrong or not. > Bazaar is really new to me. > I'm sorry for inconveniences. > > Best regards, > Quang > > On Wed, Mar 31, 2010 at 11:36 PM, <[email protected]> wrote: > > Merge authors: > > Hieu Duy Dang (hieu-hispvietnam) > > Saptarshi (sunbiz) > > Thu Tran (tran-hispvietnam) > > Tran Thanh Tri <Tran Thanh t...@compaq> > > ------------------------------------------------------------ > > revno: 1715 [merge] > > committer: Quang <qu...@quang-pc> > > branch nick: dhis2 > > timestamp: Wed 2010-03-31 23:33:49 +0700 > > message: > > Merge with the trunk. > > removed: > > > > dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.html > > > > dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed.html > > > > dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/ChangePasswordAction.java > > > > dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/changePassword.vm > > added: > > > > dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/responseTranslationInput.vm > > > > dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/responseTranslationSuccess.vm > > > > dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.jsp > > > > dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed.jsp > > > > dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/ValidateAddDuplicatedTranslationAction.java > > modified: > > > > dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/TranslationService.java > > > dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/TranslationStore.java > > > dhis-2/dhis-api/src/main/java/org/hisp/dhis/useraudit/UserAuditService.java > > > dhis-2/dhis-api/src/main/java/org/hisp/dhis/useraudit/UserAuditStore.java > > > > dhis-2/dhis-i18n/dhis-i18n-db/src/main/java/org/hisp/dhis/translation/hibernate/HibernateTranslationStore.java > > > > dhis-2/dhis-i18n/dhis-i18n-db/src/main/java/org/hisp/dhis/translation/impl/DefaultTranslationService.java > > > > dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/useraudit/DefaultUserAuditService.java > > > > dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/useraudit/hibernate/HibernateUserAuditStore.java > > > > dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.js > > > > dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm > > > > dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/I18nAction.java > > > > dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/TranslateAction.java > > > dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml > > dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml > > > dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties > > > > dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties > > > > dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java > > > > dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml > > > > dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm > > > > dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml > > > > dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties > > > > dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml > > > > dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm > > > > dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/menu.vm > > > > dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/export/SVGDocument.java > > > > dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css > > > > dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js > > The size of the diff (2757 lines) is larger than your specified limit of > 1000 lines > > > > -- > > lp:dhis2 > > https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk > > > > Your team DHIS 2 developers is subscribed to branch lp:dhis2. > > To unsubscribe from this branch go to > https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription > > > > _______________________________________________ > > Mailing list: https://launchpad.net/~dhis2-devs > > Post to : [email protected] > > Unsubscribe : https://launchpad.net/~dhis2-devs > > More help : https://help.launchpad.net/ListHelp > > > > _______________________________________________ > Mailing list: https://launchpad.net/~dhis2-devs > Post to : [email protected] > Unsubscribe : https://launchpad.net/~dhis2-devs > More help : https://help.launchpad.net/ListHelp >
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
