|IRC Nick||Time (GMT-7)||Message|
|DFUN||02:11||the latest devdrop doesn't compile: Error 7 error C2065: 'int64_t' : undeclared identifier \variant.h 679 PluginCore
anybody else having problems? What's missing?
|taxilian||09:11||DFUN: hmm. is that from git?
oh, he's gone now :-P
I think people don't really understand what plugins are
|taxilian||09:11||anyone see a problem with me moving the stable branch to git as well?
nitrogenycs: are you familiar with git?
|taxilian||10:11||amackera: did you see I added you to the firebreath github project?|
|FB_GitHubBot||10:11||FireBreath: stable Richard Bateman * 4f50a67 (0 files in 0 dirs): Removed old mercurial files (which we no longer care about, now that we're in git) ...
FireBreath: stable Richard Bateman * 7243310 (0 files in 0 dirs): Added README.mk ...
FireBreath: stable commits 0000000...7243310 - http://bit.ly/gVeNgI
|nitrogenycs||10:11||taxilian: a bit, I haven't toyed with complex branches and stuff yet|
|kalev_||10:11||taxilian: can I suggest something?|
|taxilian||10:11||kalev_: suggest away|
|kalev_||10:11||don't name the branch 'stable', but instead '1.2' or 'firebreath-1.2'
err, it should read 1.3
|taxilian||10:11||well, right now it isn't firebreath-1.3.1
I'd need to go back and find where that should be
I think i'm going to tag the releases
|kalev_||10:11||anyway, the important bit is to have 1.2, 1.3, 1.4 etc in the branch name. Instead of having two branches like 'master' and 'stable', make 'master' + one branch for each release series (1.2, 1.3, 1.4)|
|taxilian||10:11||I know what you're getting at, though; I don't want anything merged from a stable release back into the development branch|
|kalev_||10:11||and then tag the releases on the release branches|
|taxilian||10:11||if we do hotfixes, I want the hotfixes to be cherry-picked back into the development flow
I'm just not sure I want to have one branch per release
but maybe it's not that big of a deal...
|kalev_||10:11||not one branch per release, but one branch per release series: 1.3.0, 1.3.1, 1.3.2 all come from 1.3 branch|
|taxilian||10:11||hmm. okay, I can see that|
|kalev_||10:11||this way people could stay on 1.3 branch until they feel comfortable; they can be sure nobody will force 1.4 changes on them until they are ready
and if they feel like that, then they can switch to next release branch (1.4) or even master, but it has to be their own decision
I like it
|taxilian||10:11||kalev: you still haven't told me your github account so I can add you to the project|
|kalev_||10:11||I just made one yesterday, it's called kalev|
|taxilian||10:11||nitrogenycs: do you have a github account so I can add you?
kalev_: you're added
|taxilian||10:11||kalev_: firebreath-1.3 branch is now created
there is no "stable"
though I'm tempted to add a stable branch as well and just keep it pointed at the same place as the latest version branch
I think I'd avoid stable branch, other project manage fine without such aliases
|taxilian||10:11||I'm just trying to think of convenience is all
how do you set the "default" branch?
|kalev_||10:11||I think by editing .git/HEAD file|
|taxilian||10:11||will have to look at that
default should probably be the latest stable version, no?
|kalev_||10:11||other projects I have worked with have kept the development branch the default|
|taxilian||10:11||you know, that's probably not a bad thing; firebreath is generally pretty stable
we'll stick with that
see how it goes
|kalev_||10:11||good plan :)|
|taxilian||10:11||thanks. I'm glad I thought of it. ;-)
hmm. just need to decide how soon to disable source control on gcode
|_neilg_||10:11||Hey! I hope everybody (who celebrates it!) had a nice Thanksgiving :)|
|kylehuff||10:11||those of you who don't celebrate it can sit on a tack...
|taxilian||10:11||hehe. don't know about everyone else, but mine was great
so since you guys are the ones who are vocal and give me feedback, what do ya'll think about the move to github? and should I just finish moving immediately so that all source control is there?
|_neilg_||10:11||I had my parents and aunt staying with me last week to celebrate their first ever Thanksgiving|
|_neilg_||10:11||It was nice :)
What does moving to git give you that mercurial didn't have? Or is it specifically github itself that made the move appealing?
I was just wondering :)
ability to use svn for checkouts for those too lazy to learn something new
easier forking (creating your own clone)
pull requests (as implemented by github, specifically)
ability to fork and then have multiple people able to work on that fork, so a company can have their own fork of firebreath with all employees able to acces it, for example
those are the ones that come to mind offhand
I'm sure there are others
oh, yeah, I really like the ease of working with multiple remotes
|_neilg_||10:11||You had me at intelligent branching. It was bizarre that Google Code had me completely fork Firebreath in order to commit patches - with no easy way to get fixes back into trunk|
|taxilian||10:11||yeah, that's why I mentioned that first =] it's much nicer|
|kalev_||10:11||I have no experience whatsoever with github, but for some reason working with Mercurial has always felt awkward for me; with git I just feel at home.|
|_neilg_||10:11||Okay, I'm sold then. Not that it really mattered, I'd just wondered what it gave! The svn ability could be very useful too|
|taxilian||10:11||kalev_: yeah, I know what you mean. mercurial isn't bad, but it's just not quite there|
|_neilg_||10:11||Being able to pull down FireBreath as an svn:external could be very useful here|
|taxilian||10:11||_neilg_: yep. keep in mind that with svn you'll have to pull down the boost libs as well seperately, as the submodule thing doesn't work with svn
for any not familiar or not very good with git, read chapters 2 and 3 of this: http://progit.org/book/
it's pretty succinct and well written
|_neilg_||10:11||Wouldn't be a problem in my case, I don't use the Boost that comes with FB :)
But it's useful to know though
I do have a FB related question though... Is there any particular reason that only the X11 version of FB keeps track of the plugin window dimensions?
I added it to the PluginWindowWin for us but it seems like this is common data that would be useful for all the plugins, no?
|taxilian||11:11||_neilg_: you'll probably like this better, then, since it doesn't download the unneeded files automatically
_neilg_: I would tend to agree, yes
_neilg_: the reason is that nobody has added it anywhere else
feel free =]
|_neilg_||11:11||Okay, I'll add that. It seems very useful - though maybe only to me. ;)|
|taxilian||11:11||no, others have indicated surprise about it as well
I just don't have time to add every little thing myself =]
now, if I were you, I would fork the FireBreath project on github and use that with your svn:external bit; that way you control when it updates
but you also can change things and submit a pull request for it to get back into the main repo
and you can give access to that repo to your coworkers
but that's just me
|_neilg_||11:11||Yup, that seems like a good way to go. It sounds like a big win from all sides!|
|taxilian||11:11||I just turned off the source tab on the gcode site|
|kylehuff||11:11||agreed.. 1+ for git...|
|taxilian||11:11||1+.. is that slightly higher than 1?|
|_neilg_||11:11||Well, it's positive at any rate|
|kylehuff||11:11||I meant +1|
|taxilian||11:11||have to admit; the git plugin for hudson is pretty sweet
collects way more info than any of the other SCM plugins I've used
also automatically fetches submodules and everything
|taxilian||12:11||think I just about have the nightly build working from git|
|taxilian||12:11||I haven't actually disabled the hg source; just hid it|
|nitrogenycs||12:11||taxilian: looking into the github stuff, I have accounts everywhere, but not there
taxilian: just created an account, name is nitrogenycs
|taxilian||12:11||welcome to the github team =]|
|FB_GitHubBot||12:11||FireBreath: master Richard Bateman * e749e2a (0 files in 0 dirs): Removed old mercurial files (which we no longer care about, now that we're in git)
FireBreath: master Richard Bateman * 9ca91a7 (0 files in 0 dirs): Added README.md
FireBreath: master Richard Bateman * 0bf071b (1 files in 1 dirs): Updated README.mk
FireBreath: master commits c9c9cdb...0bf071b - http://bit.ly/eO2aKN
|nitrogenycs||12:11||taxilian: thx for the add. I've seen the mail on the mailing list today, but no time to debug into this at the moment|
|taxilian||12:11||understood; why don't you ask him to create an issue so you can look at it later?|
|nitrogenycs||12:11||ya, that's what I am doing right now|
I have to say, it feels good to be using git instead of mercurial; Georg might kill me when he gets back, but this will solve a lot of little minor issues that have been bugging me
|nitrogenycs||12:11||I think I also prefer git to hg. It's a bit more logical and easier in some places|
|taxilian||13:11||*sigh*. bugs are stacking up again. I need to squash some of them
anyone want to donate to the "buy Richard a license for Visual Assist" fund? :-P
|_neilg_||13:11||I've gotten you to like Visual Assist then have I? ;)|
|taxilian||13:11||yes, curse you!
I don't have $400 to drop on it
but my license expires tomorrow :-P
if I weren't a contract employee I could probably get facebook to purchase it for me
but as things are..
|_neilg_||13:11||What about the educational license?|
|taxilian||13:11||considering it; that's only $50
'course, it only has upgrades for 6 months
and $50 can still be a lot for us poor college students =]
|nirvdrum||16:11||taxilian: I like the github IRC notifications here.
taxilian: If you need $50 for Visual Assist, I can have Mogotest make a project donation.
We're not rolling in cash, but I can swing that ;-)
taxilian: But if you need the $400 one, let me know and we probably can work something out there, too.
|taxilian||16:11||that definitely seems like the "correct" way to do it; we never merge the stable branch back into dev
instead, when we fix something that needs to go into dev (branch master) we cherry pick the commit in
|taxilian||17:11||any of you guys ever played with gource?|
|taxilian||18:11||I like the way that with git I was able to *easily* go back and add branches for 1.0, 1.1, 1.2, and 1.3 -- and then I was able to add tags for all of the other releases|
|taxilian||18:11||wow. the github fork queue is pretty much just awesome|
I'm a big fan of the branch compare views now, too.
|taxilian||19:11||in short, I'm quite happy with the github migration so far =]
and nobody has complained yet :-P
|nirvdrum||20:11||taxilian: Just let me know on that Visual Assist license.|
|taxilian||20:11||wow... I had totally missed his offer :-P that's awesome|
|taxilian||22:11||kalev_: you'll be happy to note that the ohloh stats are (finally) working again
now that we've switched to git
Just wanted to share the link with firebreath team: http://ifoam.ponds.com.cn/game/index.html project went live, and wouldn't be possible without FB library. I'm now compiling for Mac, hopefully Mac version will be available in 10-12h
FB copyright is in license agreement when user is installing the plugin. If this copy needs to be changed, please let me know at [email protected]
(I've just copied it from your source code)