dhis2-devs team mailing list archive

[Abyot Gizaw <abyota@xxxxxxxxx>]

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 <chbharathk@xxxxxxxxx> 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<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
>
>