search

SwerveRobotics / ftc_app

FTC robot controllers ++
15 stars 38 forks source link

February SDK update not in this repository #92

Closed nrizzio closed 8 years ago

nrizzio commented 8 years ago

83d998b9e9937e51b96acae151aa10b993ca1a83 has been on the upstream repository for almost three months now but it hasn't been merged into Swerve's master branch (based on the "1 commit behind of ftctechnh/ftc_app hint on the main page).

@rgatkinson

nrizzio commented 8 years ago

Actually, I'm (mostly) wrong. It uses the March beta libraries:

It currently is synchronized to the beta release from FTC HQ that was published in March, 2016 (version 1.7).

@rgatkinson, I would prefer that the libraries here would be updated by git mergeing from FIRST's repository (like this merge commit), since it makes for a cleaner git history and prevents the following from happening (and only getting worse) on the main repository page: screenshot from 2016-05-22 18-54-02 The reason being that this can be a great visual indicator of whether new changes from FIRST have yet to be introduced into this SDK.

Merge conflicts will be detected by git and can be resolved manually if they happen, which they probably will if you merge the latest commit from the FTC beta branch.

But that's just my opinion. If anyone else has any comments, please post!

rgatkinson commented 8 years ago

@nrizzio: While I understand your point, and it makes sense, it turns out to be surprisingly difficult to achieve in practice due to the the multiple versions of multiple libraries that we're maintaining. Apologies, but I don't think we can accommodate this.

One thing though: we do not expect that anyone will merge the FTC tree into the Swerve tree as you allude to. That's not something we support, as, generally, changes in the core SDK require concomitant changes in the Swerve tree (though that is decreasing over time). We do try hard to minimize any lag involved between the releases.