[Dhis2-devs] Not able to find the changes that we committed into Trunk

Hi, Not sure what is happening in the trunk, I can't find my( and other developers) commits in Trunk. Today morning when I update my code it shows conflicts and when i check bzr st it showed list of files which i didn't work. Then I checkout the fresh code, when i am checking i am not able to fi

Re: [Dhis2-devs] Not able to find the changes that we committed into Trunk

Hi Bharath, Not sure if this is related to what I did on Monday I think. Jo also mentioned me something like "... content is there but history is lost..." - which I couldn't understand it exactly. What I did on Monday was ... merged the trunk with the community branch using the following command

[Dhis2-devs] Nice thematic map examples

Perhaps some inspiriation from the following tutorial: http://flowingdata.com/2009/11/12/how-to-make-a-us-county-thematic-map-using-free-tools/ Similar, using Pentaho Data Integration (Kettle): http://blog.braintapper.com/using-pentaho-data-integration-to-make.html Examples and discussion: http:/

Re: [Dhis2-devs] Not able to find the changes that we committed into Trunk

Hi, I'm guessing I am responsible for this one. Think I did an uncommit on what I thought was a local branch looking at how to fix the trouble Abyot mentioned... Turns out it was a checkout :( Basically the contents of trunk should be ok again now, though the version history is kind of a mess.

Re: [Dhis2-devs] Nice thematic map examples

And some examples of the same using R: http://blog.revolutionanalytics.com/2009/11/choropleth-challenge-result.html On Thu, Oct 28, 2010 at 12:29 PM, Knut Staring wrote: > Perhaps some inspiriation from the following tutorial: > http://flowingdata.com/2009/11/12/how-to-make-a-us-county-thematic-m

[Dhis2-devs] Rules for merging

Hi We had some trouble this morning that points out the need for some basic rules when working on branches. A have written up at dhis2.org which is copied in below. Please read carefully. http://dhis2.com/development A few rules apply when working with the source code branches: - Never use

Re: [Dhis2-devs] Rules for merging

2010/10/28 Lars Helge Øverland > > Hi > > We had some trouble this morning that points out the need for some basic > rules when working on branches. A have written up at dhis2.org which is > copied in below. Please read carefully. > > http://dhis2.com/development > > > A few rules apply when work

Re: [Dhis2-devs] Rules for merging

OK good point I have updated the docs: http://dhis2.com/development#collaborationconventions ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscr

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/cbhis-mobile]

Status: Development => Merged -- lp:~dhis2-devs-core/dhis2/cbhis-mobile https://code.launchpad.net/~dhis2-devs-core/dhis2/cbhis-mobile Your team DHIS 2 developers is subscribed to branch lp:~dhis2-devs-core/dhis2/cbhis-mobile. To unsubscribe from this branch go to https://code.launchpad.net

Re: [Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/cbhis-mobile]

Den 28. okt. 2010 kl. 19.00 skrev Jo Størset: >Status: Development => Merged Pushed wasn't an option :) Jo ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-

[Dhis2-devs] the data element category

hello Lars and ola, hope you are good, listen I was going though the new dhis, it seems like you cant create two categories with some related category option, exmple I might have a program with age dis-aggreation like >1, 1-4, 5 - 49, < 49 and another one >1, 1-5, < 5, how will you be able to imp

Re: [Dhis2-devs] the data element category

2010/10/28 Yusuph Kassim > hello Lars and ola, > > hope you are good, listen I was going though the new dhis, it seems like > you cant create two categories with some related category option, > > Hi Yusuph, This is correct and an important restriction. Options can only belong to one category, thi