logame team mailing list archive

[Paul Elms <paul@xxxxxxxxxxxxxx>]

Hi Chris,

On Tue, 2009-10-06 at 07:05 -0500, Christian Smith wrote:
> Sorry, I have been quiet. I have been busy at work. Hopefully I can have 
> a simple menu for the game. 
No problem :)

> Having some trouble wrapping my mind around 
> someone else's code (i have new found respect for FLOSS devs now).
Yeah, it's not always easy reading other peoples code and trying to work
out what they are doing, and I know I should comment my own code a bit
more...  So, please ask about the code if there is something you don't
get, if I have written some really odd code I would rather clean it up
and make it understandable, so others can get into the project.

> I have a question about merging it back, do I just send it to my own 
> trunk, or can  merge i back into the main truck? how exactly does that 
> work? (I am new to bzr and revision control in general, need a crash 
> course, if you have a link to one.)
> So yea, i am not dead :)--

I am also new to bzr, as I think is Ben, so we'll all mess it up
together :)

I wrote an email about how I think bzr should work for us a while back,
I've copied it below:

Hi all,
As some of us (including me :)) are new to bzr, I thought I would have a
look in the manual and then detail here, how I think we should be
working with it.  If anyone else has more experience with bzr and knows
better, please shout!

Looking at
http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#organizing-branches
I think this is how we should be working as are decentralised with a
shared mainline branch.

Essentially, each contributor has, on their computer a mirror branch and
Feature branch(s).  The mirror branch is not worked in, it is a local
copy of the main launchpad branch.  The mirror branch is set up using
bzr branch lp:logame.

Then for each new feature/bug a contributor is working on they make a
local branch from their local mirror giving it a name like so:
bzr branch mirror_dir cool_feature
Then cd into the new branch and write the new feature etc..

The updating of the mirror and merging of changes to and from the
feature branches is then carried out as on the link.

Any problems/disagreements then shout.

Paul