so the change from our current setup is that stuff in beta is reverted if it isn't good enough, and beta is merged into master on release?
2012-07-18 20042, 2012
ocharles
yes, and i've already been doing the revert anyone
2012-07-18 20044, 2012
ocharles
anyway*
2012-07-18 20053, 2012
ocharles
because resetting and then merging everything good back in is way too time consuming
2012-07-18 20005, 2012
warp
ok
2012-07-18 20041, 2012
warp
it doesn't seem like a huge change from what we do now, so I won't object.
2012-07-18 20059, 2012
ocharles
it just means that branching off master is sensible for these hotfixes
2012-07-18 20047, 2012
warp
ocharles: is the release doen?
2012-07-18 20049, 2012
warp
done?
2012-07-18 20054, 2012
ocharles
almost
2012-07-18 20002, 2012
ocharles
all back
2012-07-18 20037, 2012
ocharles tweets
2012-07-18 20030, 2012
ocharles
so yea, it's basically just carton that is the only 'new' thing in master
2012-07-18 20046, 2012
warp
you mean a bunch of deps got upgraded?
2012-07-18 20053, 2012
ocharles
yea
2012-07-18 20005, 2012
ocharles
and a few minor fixes to our HTML::FormHandler stuff to work with the latest version
2012-07-18 20030, 2012
warp
ok, sounds fine :)
2012-07-18 20046, 2012
ocharles
warp: you didn't update tests again
2012-07-18 20056, 2012
ocharles
expect CI to complain in the half an hour
2012-07-18 20014, 2012
warp
oh, meh
2012-07-18 20059, 2012
warp
I'll go and fix that then.
2012-07-18 20055, 2012
plaintext joined the channel
2012-07-18 20033, 2012
MBJenkins
* oliver.g.charles: MBS-5015: Fix the Field::Length field now that HTML::FormHandler has been updated
2012-07-18 20034, 2012
MBJenkins
* oliver.g.charles: MBS-4949: Fix the display of Facebook URLs
2012-07-18 20035, 2012
MBJenkins
* warp: Replace register.js with reCAPTCHA.
2012-07-18 20036, 2012
MBJenkins
* oliver.g.charles: Prefer $c->req->address over $ENV{REMOTE_ADDR} and remove old .js reference
2012-07-18 20055, 2012
ocharles
warp: so, with the new branch stuff...
2012-07-18 20008, 2012
ocharles
to make this fix, you should branch off master and then merge to 'master' and 'develop'
2012-07-18 20029, 2012
ocharles
but don't merge to develop just yet, as i'm shipping all of beta to it
2012-07-18 20050, 2012
djce joined the channel
2012-07-18 20014, 2012
warp
ocharles: hm, so what's develop?
2012-07-18 20032, 2012
warp
I thought you were only changing how we work with beta.
2012-07-18 20006, 2012
ocharles
develop is what we work on
2012-07-18 20010, 2012
ocharles
beta runs the develop branch
2012-07-18 20025, 2012
warp
so the beta branch will no longer exist?
2012-07-18 20037, 2012
ocharles
correct. s/beta/develop/ now
2012-07-18 20045, 2012
warp
ok
2012-07-18 20049, 2012
ocharles
and s/next/test/ because it was a confusing name
2012-07-18 20003, 2012
ocharles
this model has basically bought us back round to master/production as before
2012-07-18 20004, 2012
warp
well, now developer is confusing
2012-07-18 20010, 2012
warp
er, develop is confusing.
2012-07-18 20014, 2012
ocharles
you develop on the develop branch
2012-07-18 20024, 2012
warp
next was only confusing because it didn't match the subdomain it was running on.
2012-07-18 20029, 2012
ocharles
yea
2012-07-18 20034, 2012
ocharles
next has otherwise not changed
2012-07-18 20043, 2012
warp
but now beta is confusing because it is not running the beta branch
2012-07-18 20050, 2012
ocharles
heh
2012-07-18 20055, 2012
warp
so you fix one and break the other
2012-07-18 20028, 2012
ocharles
i mostly went with calling it 'develop' because there's already an established workflow
2012-07-18 20045, 2012
ocharles
so rather than invent yet more naming conventions ourselves, figured we might as well adopt some one elses work
2012-07-18 20032, 2012
ocharles
warp: so what do you think?
2012-07-18 20058, 2012
ocharles
if you prefer 'master', 'beta' and 'test' branches, we can go with that
2012-07-18 20013, 2012
ocharles
merging 'beta' into 'master' doesn't seem incorrect
2012-07-18 20024, 2012
warp
ocharles: I prefer beta, because the disconnect between the branch and the subdomain seems far more confusing that not adhering to a naming convention I'm not familiar with.
2012-07-18 20031, 2012
warp
s/that/than/
2012-07-18 20051, 2012
warp
I'll get used to anything though, so I don't feel super strongly about it.
2012-07-18 20054, 2012
ocharles
there's still a disconnect at master
2012-07-18 20000, 2012
ocharles
can never be perfect
2012-07-18 20034, 2012
warp
our use of master doesn't really seem idiomatic, no.
2012-07-18 20015, 2012
warp
oh master is the production branch in the .png you linked.
2012-07-18 20018, 2012
ocharles
yes
2012-07-18 20036, 2012
ocharles
you release 'master' out into the public
2012-07-18 20059, 2012
warp
I was thinking of master more like trunk in svn, but I don't really know how common such usage is.
2012-07-18 20011, 2012
ocharles
it seems strange to tell people to branch off beta to work on new features
2012-07-18 20046, 2012
ocharles
they can branch off master, just means they won't get anywork that's currently in beta testing
2012-07-18 20051, 2012
ocharles
which isn't really the end of the world i suppose
2012-07-18 20001, 2012
warp
that seems like the right approach.
2012-07-18 20008, 2012
warp
that way they're not affected if something in beta is reverted.
2012-07-18 20024, 2012
ocharles
define 'affected'
2012-07-18 20052, 2012
warp
ah, a revert shouldn't matter anyway. (unless that code depends on that branch, in which case it should be reverted along with it anyway).
2012-07-18 20013, 2012
ocharles nods
2012-07-18 20019, 2012
ocharles
a revert is just another commit
2012-07-18 20023, 2012
RavenD joined the channel
2012-07-18 20033, 2012
RavenD
hello
2012-07-18 20035, 2012
RavenD has left the channel
2012-07-18 20030, 2012
ocharles
warp: alright, we have master, beta and test
2012-07-18 20035, 2012
ocharles
in order of increasing instability
2012-07-18 20045, 2012
warp
:D
2012-07-18 20047, 2012
ocharles
test is reset to beta. beta is merged into test and master
2012-07-18 20019, 2012
ijabz
heh git workflow is soõ complex
2012-07-18 20059, 2012
ocharles
it's only complex because we have somewhat odd requirements
2012-07-18 20040, 2012
ocharles
anyway, just being able to merge beta into master will make my life much less sucky, so i'm happy :)
