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

revision-diff.txt (1.85 KB)

Reverted trunk back to revision 800 as requested by Tri.

···

On Tue, Sep 29, 2009 at 12:51 PM, noreply@launchpad.net 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

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.

=== modified file ‘dhis-2/dhis-options/src/main/java/org/hisp/dhis/options/SystemSettingManager.java’

— dhis-2/dhis-options/src/main/java/org/hisp/dhis/options/SystemSettingManager.java 2009-09-14 19:02:15 +0000

+++ dhis-2/dhis-options/src/main/java/org/hisp/dhis/options/SystemSettingManager.java 2009-09-29 10:27:29 +0000

@@ -53,6 +53,8 @@

 final String KEY_GIS_LONGITUDE = "longitude";

 final String KEY_GIS_LATITUDE = "latitude";
 void saveSystemSetting( String name, Serializable value );

=== modified file ‘dhis-2/dhis-web/dhis-web-portal/pom.xml’

— dhis-2/dhis-web/dhis-web-portal/pom.xml 2009-09-28 19:33:22 +0000

+++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2009-09-29 10:27:29 +0000

@@ -113,15 +113,14 @@

   <artifactId>dhis-web-mapping</artifactId>

   <version>${version}</version>

   <type>war</type>

=== modified file ‘local/vn/dhis-web-gis/pom.xml’

— local/vn/dhis-web-gis/pom.xml 2009-09-11 11:46:20 +0000

+++ local/vn/dhis-web-gis/pom.xml 2009-09-29 10:27:29 +0000

@@ -9,7 +9,7 @@

    </parent>



    <artifactId>dhis-web-gis</artifactId>
  •   <packaging>jar</packaging>
    
  •   <packaging>war</packaging>
    
      <name>DHIS GIS</name>
    
    
    
      <build>
    

Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp

Dear Lars,

. Can you explain to me how the draft files as with form .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@gmail.com

Reverted trunk back to revision 800 as requested by Tri.

On Tue, Sep 29, 2009 at 12:51 PM, noreply@launchpad.net 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

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp


Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp


Hieu.HISPVietnam

Good Health !

Hi Hieu

from the bazaar user guide:

Sometimes Bazaar will attempt to create a file using a pathname that has already been used. The existing file will be renamed to “FILE.moved”. If you wish, you can rename either one of these files, or combine their contents. When you are satisfied, you can run “bzr resolve FILE” to mark the conflict as resolved.

Have a look here:

http://doc.bazaar-vcs.org/bzr.0.92/en/user-guide/conflicts.html

Lars

···

2009/10/1 Hieu Dang Duy hieu.hispvietnam@gmail.com

Dear Lars,

. Can you explain to me how the draft files as with form .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 !