Code review comment for lp:~mxsscott/widelands/windowed-graphics

Revision history for this message
SirVer (sirver) wrote :

Okay, Ack. Code LGTM, so feel free to push it.

I gave you push rights to trunk (by adding you to widelands dev). here comes the very important usual disclaimer: bzr is awefull in one regard that you can push your branch history to trunk without confirmation. that is, if you work in a branch and someone adds new revisions to trunk in the meantime, when you push your branch to trunk you will overwrite those changes!!!

so, the proper thing is to always keep a version of trunk around that you do not modify. I personally use this workflow: http://www.taoeffect.com/blog/2009/06/using-bazaar-like-git-repoalias-plugin/

you then always work in branches:

$ cd trunk && bzr switch -b bug123
hack hack, commit, commit
$ bzr switch trunk && bzr pull && bzr merge .bzr-repo/bug123
$ bzr push lp:widelands

especially never push to lp:widelands from a feature branch or before you pulled. bzr uncommit helps sometimes to undo errors.

feel free to ask for anything when you need help. this is really important to get right - though basically everybody gets it wrong once. this will result in mailbombs from bzr and "XXX revisions removed." mails which are confusing at best.

« Back to merge proposal