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

[bharath kumar]

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 find
changes that we made.

Is some one fixing this?

Shall we stop development till it is fixed?


-- 

Regards,
Bharath Kumar. Ch
___
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

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

[Abyot Gizaw]

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 commands from the community branach

bzr merge lp:dhis2
bzr push lp:dhis2

Abyot.

On Thu, Oct 28, 2010 at 9:46 AM, bharath kumar  wrote:

> 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 find
> changes that we made.
>
> Is some one fixing this?
>
> Shall we stop development till it is fixed?
>
>
> --
>
> Regards,
> Bharath Kumar. Ch
>
> ___
> 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

[Dhis2-devs] Nice thematic map examples

[Knut Staring]

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://flowingdata.com/2010/10/26/unemployment-rates-over-this-past-year/
http://drop.io/inup25f/asset/unemp-change-png
http://en.wikipedia.org/wiki/Jenks_Natural_Breaks_Optimization#cite_note-Jenks-0
-- 
Cheers,
Knut Staring

___
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

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

[Jo Størset]

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. Guess we can live with that, though basically we 
have lost the version history for revisions ~1890 - 2426 and then 
again(probably) for revisions 1948 - 1972, plus got a revision history from a 
branch that we didn't want.

Waiting for Lars to come back to wether we should try to fix some of it or if 
we just live with it as is. Basically it should be possible to fix, but might 
take too long to be worth it.

Jo
___
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

Re: [Dhis2-devs] Nice thematic map examples

[Knut Staring]

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-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://flowingdata.com/2010/10/26/unemployment-rates-over-this-past-year/
> http://drop.io/inup25f/asset/unemp-change-png
> http://en.wikipedia.org/wiki/Jenks_Natural_Breaks_Optimization#cite_note-Jenks-0
> --
> Cheers,
> Knut Staring
>



-- 
Cheers,
Knut Staring

___
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

[Dhis2-devs] Rules for merging

[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 working with the source code branches:

   - Never use *bzr push*! Pushing will replace the content in trunk which
   means that the revision history will be lost. It is also prone to merging
   mistakes like overwriting other work in trunk.
   - Never use *bzr uncommit*! If you have made a mistake and want to fix
   it, then do *bzr merge -r 100..90* (replace 100 and 90 with the revisions
   you want to remove) and commit as usual. Un-comitting will lead to problems
   as the lastest changes will be undone for all working copies when updated.

When its time to merge your branch with trunk, given that you have the
required authority, please follow these steps:

   - Make sure you don't have un-comitted changes in your branch.
   - Navigate to a checkout of trunk and make sure there are no un-comitted
   changes there.
   - Merge with *bzr merge lp:~dhis2-devs-core/dhis2/branch-name* (replace
   branch-name with the name of your branch).
   - Go through the changes with *bzr status* and *bzr diff*.
   - Commit your changes.



Lars
___
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

Re: [Dhis2-devs] Rules for merging

[Jan Henrik Øverland]

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 working with the source code branches:
>
>- Never use *bzr push*! Pushing will replace the content in trunk which
>means that the revision history will be lost. It is also prone to merging
>mistakes like overwriting other work in trunk.
>- Never use *bzr uncommit*! If you have made a mistake and want to fix
>it, then do *bzr merge -r 100..90* (replace 100 and 90 with the
>revisions you want to remove) and commit as usual. Un-comitting will lead 
> to
>problems as the lastest changes will be undone for all working copies when
>updated.
>
> When its time to merge your branch with trunk, given that you have the
> required authority, please follow these steps:
>
>- Make sure you don't have un-comitted changes in your branch.
>- Navigate to a checkout of trunk and make sure there are no
>un-comitted changes there.
>- Merge with *bzr merge lp:~dhis2-devs-core/dhis2/branch-name* (replace
>branch-name with the name of your branch).
>- Go through the changes with *bzr status* and *bzr diff*.
>- Commit your changes.
>
> Don't forget to merge trunk into your branch before merging your branch
into trunk:

   - your_branch>$ *bzr merge lp:dhis2*

   then

   - trunk>$ *bzr merge lp:~dhis2-devs-core/dhis2/your_branch*

If there are any uncommited changes in your working copy you are not even
allowed to merge.




>
>
> Lars
>
>
> ___
> 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

Re: [Dhis2-devs] Rules for merging

[Lars Helge Øverland]

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
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

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

[Jo Størset]

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/~dhis2-devs-core/dhis2/cbhis-mobile/+edit-subscription

___
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

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

[Jo Størset]

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-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] the data element category

[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,

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 implement these
categories if you wont be allowed to re use the >1 and 1-4? I think this
should be looked at. or what do you think?

-- 
Yusuph Kassim Kulindwa,
University of Dar Es Salaam,
Department of Computer Science,
System Developer/ Research Assistant.

Cell: +255 713 535648
___
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

Re: [Dhis2-devs] the data element category

[Ola Hodne Titlestad]

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, this is to make sure aggreation of catoptioncombos for a data
element is consistent.

You can (and should as much as possible) use categories in mutiple
catcombos, but not options in mutiple categories.

If you search the dev list you'll find lots of emails were this has been
discussed, if your interested in more details.


> 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 implement these
> categories if you wont be allowed to re use the >1 and 1-4? I think this
> should be looked at. or what do you think?
>
> You can use many variations here, e.g. >1y, >1, >1 yrs.

Ola
--



> --
> Yusuph Kassim Kulindwa,
> University of Dar Es Salaam,
> Department of Computer Science,
> System Developer/ Research Assistant.
>
> Cell: +255 713 535648
>
___
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