← Back to team overview

dhis2-devs team mailing list archive

Re: [Branch ~dhis2-devs-core/dhis2/trunk] Rev 802: dhis-web-portal/pom.xml

 

Dear Lars,

. Can you explain to me how the draft files as with form *<filename>
.js.moved* which could generate after reverting action back to the revision
before ?
. By the way, if I deleted these above files after that I would commit the
source code to trunk again so the problem would be happened is that
conflicting. And what should I do to avoid this issue without deleted all
modules and re-updating ?

At the present, that is the way which I have to do to avoid that problem.

Thank you !


2009/9/29 Lars Helge Øverland <larshelge@xxxxxxxxx>

>
>
> Reverted trunk back to revision 800 as requested by Tri.
>
>
>
> On Tue, Sep 29, 2009 at 12:51 PM, <noreply@xxxxxxxxxxxxx> wrote:
>
>> ------------------------------------------------------------
>> revno: 802
>> committer: Tran Thanh Tri <Tran Thanh Tri@compaq>
>> branch nick: trunk
>> timestamp: Tue 2009-09-29 17:27:29 +0700
>> message:
>>  dhis-web-portal/pom.xml
>> modified:
>>
>>  dhis-2/dhis-options/src/main/java/org/hisp/dhis/options/SystemSettingManager.java
>>  dhis-2/dhis-web/dhis-web-portal/pom.xml
>>  local/vn/dhis-web-gis/pom.xml
>>
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~dhis2-devs<https://launchpad.net/%7Edhis2-devs>
>> Post to     : dhis2-devs@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~dhis2-devs<https://launchpad.net/%7Edhis2-devs>
>> More help   : https://help.launchpad.net/ListHelp
>>
>>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~dhis2-devs<https://launchpad.net/%7Edhis2-devs>
> Post to     : dhis2-devs@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~dhis2-devs<https://launchpad.net/%7Edhis2-devs>
> More help   : https://help.launchpad.net/ListHelp
>
>


-- 
Hieu.HISPVietnam
Good Health !

Follow ups

References