← Back to team overview

widelands-dev team mailing list archive

Re: Bzr commit mixup

 

Hey,

the flow of actions was as follows:
- Peter accidentally pushed to trunk and messed up the history of trunk.
- I restored from a backup I had here from r6436. We lost 3 revision (-r6439).
- Peter replayed those revisions via patches. The content of trunk is now as it was before the mishap, the history however is changed. I advise everybody to run 
***bzr pull --overwrite***
ONCE in their checkout. Otherwise you will have trouble down the road. 

Hopefully this sorts things out for everybody. Bzr offers to much rope to hang you with I fear :/. 

Holger

On 02.11.2012, at 12:44, Peter Schwanemann wrote:

> Hey girls and guys,
> 
> I want to beg your pardon for the mass of mails you might have received in the last hour.
> Something went terribly wrong with my bzr or better to say the bzr setup.
> Luckily SirVer fixed the bzr main branch (trunk) again, so everything should be back up normal.
> 
> Sorry for the confusion, please ignore the massive amount of mails!
> 
> Cheers
> Peter
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~widelands-dev
> Post to     : widelands-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~widelands-dev
> More help   : https://help.launchpad.net/ListHelp



References