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
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@gmail.com 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
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