11-29-2014, 05:00 AM
|
#3
|
Stuff Do-er
Lua Team Wiki Team Fortress Forever Staff
Join Date: Mar 2007
Location: Northern California
Class/Position: Rallygun Shooter Gametype: Conc tag (you just wait) Affiliations: Mustache Brigade Posts Rated Helpful 352 Times
|
Felt like pointing a few more things out:
Some issues of note that could benefit from feedback:
Some info about the fortressforever/fortressforever branches:- We recently moved from SVN to Git, so there are a few oddities with the Git repo.
- The beta branch (the default branch) is based on the 2.46 release branch of the svn, which means that it contains lots and lots of merge commits rather than the original commits
- The dev/svn branch has the original commits and a lot more. It contains all of the commits that never made it into a release, like an in-game IRC client, spy hookgun, scout movement weapon, alternate engi grenades, and a whole ton of experimental changes that are at various levels of finalization
- A side effect of the above (and because of how SVN handles merges), these branches do not really share history properly and the beta branch distorts the amount of commits everyone made (because I was the one doing the merging for a while), which makes it look like I committed way, way more than I actually did
Last edited by squeek.; 11-29-2014 at 05:20 AM.
|
|
1 members found this post helpful.
|