search

team5735 / FRC-2024

FRC 2024 season robot code base
Other
1 stars 0 forks source link

What to Do with Comp Branch? #21

Open JacobyIA opened 6 months ago

JacobyIA commented 6 months ago

I personally believe that it should be preserved as-is, for the same reasons we have always had it; however, it features many important tidbits that I feel should be merged into our main branch (things like auto changes and button additions, all the last minute code changes). I have opened this issue as forum for discussion.

ZWORX52 commented 6 months ago

I'll see what I can git-cherry-pick. Could you get a list of commits on comp that aren't parents of main/develop? (man 7 gitrevisions)

JacobyIA commented 6 months ago

I am pretty certain I understand what you are asking, and have comprised a list of all commits from branch comp that are not within branches develop or main (there is complete overlap in this case):

These were all attained by comparing the branches within the GitHub website, and it is again possible I misinterpret.

ZWORX52 commented 6 months ago

This is what I asked for but I would have preferred use of the cli... (your Mac should have it if you downloaded WPILib there, which I believe you have done) Yes, develop should have complete overlap on main; main should just be a historic point on develop that's been tested. Do any of those stand out to you as necessary on develop? I'll fetch their summaries real quick (this is why we write good ones lol)

ZWORX52 commented 6 months ago 
commit c58bb86e475d192949c4ec3f9c8d64c5cac90d54
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Fri Apr 5 15:08:33 2024 -0400

    angle override and auto tuning (hello from NE DCMP!!)

commit 09098e8bda8a5ab6115c489c518d878fb7c7bfdc
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Thu Apr 4 13:26:53 2024 -0400

    auto path fixes

commit 7dea5683ba3eb0f74e6c6975ef57bf17fccd5109
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Wed Apr 3 19:03:36 2024 -0400

    Far Middle Auto

commit 9372eee54f4ed706284c86b4c3d551f1c0bf737a
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Tue Apr 2 16:19:21 2024 -0400

    4N auto time save

commit ec4b1ffd8f8fb946740619f65efac7da2273dd3f
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Sun Mar 31 14:56:59 2024 -0400

    slight auto and realignment

commit 60f1947e437d43ae2c6c3f83a7ce0cae72327619
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Sat Mar 30 09:48:35 2024 -0400

    Intake Deadlines auto

commit 44d154f59f4d298198aec7925896995c65cbde35
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Fri Mar 29 15:21:49 2024 -0400

    Increased the number of blinks on intake

commit 3fbd5175fa099586fc5d0ee95ecedd53b794ea57
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Fri Mar 29 15:18:13 2024 -0400

    Small tolerance change when at base of angle

commit 45184546c48508472bf1b59691a7f00ca4601446
Author: Jacoby Adwin <jacoby_adwin@student.waylandps.org>
Date:   Fri Mar 29 15:00:27 2024 -0400

    forgot this one

commit 56c0b2854aa5568a2f7b724137becfaa6e105cce
Author: Jacoby Adwin <jacoby_adwin@student.waylandps.org>
Date:   Fri Mar 29 14:58:44 2024 -0400

    Selective copy-over of Limelight blinking

commit 2360bb128914f4dfaba32be310d6bb7b51c7cbbc
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Tue Mar 26 19:21:59 2024 -0400

    commit working changes

commit 890f876f10fa74169f5ef05f8f36148b676b8bcf
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Sun Mar 24 09:10:14 2024 -0400

    no move auto

commit 81b5826a517d7d9acab1abc55774df79cee73ac2
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Sun Mar 24 09:01:05 2024 -0400

    4n n4 fixing

commit 276889da342615b7132ad322a55f48db2cfc8274
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Sat Mar 23 16:16:26 2024 -0400

    autos, shooter stop redundancy for safety

commit d0275450ae610246afea3efed87402b1f747a412
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Fri Mar 22 12:34:16 2024 -0400

    yes

commit 25a89099eee58ff615ea014cad0adaaca1209687
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Thu Mar 21 20:45:08 2024 -0400

    add call to resetShooterShenanigans in Robot.java:teleopInit

commit 1ae3dbbec72ea31337841f4f31302d206750833c
Author: ZWORX52 <66217856+ZWORX52@users.noreply.github.com>
Date:   Thu Mar 21 13:08:04 2024 -0400

    reformat robotcontainer.java

commit 89d9e19becf539c32fb4e2eb8a43949a5c918747
Author: btho7793 <77469772+btho7793@users.noreply.github.com>
Date:   Thu Mar 21 11:35:03 2024 -0400

    autoFixes
ZWORX52 commented 6 months ago

To clarify, I ask because I didn't do much of anything on comp (only commit was 1ae3dbb). Also our lists are reversed from each other, keep that in mind.

JacobyIA commented 6 months ago

Do any of those stand out to you as necessary on develop?

As I have in the past stated, I am of the opinion that all button configs and autos are finalized on branch comp and should be compared from there.

Additionally, just to restate, this issue is not opening the question of how to merge branches, I think we all have a relatively robust understanding of that, but instead to answer the question of what to do with the branch and why.

ZWORX52 commented 6 months ago

I understand that. Any other commits you want to keep? You can try these shenanigans yourself- just git checkout develop or preferably a topic branch and git cherry-pick <hash> where is the commit on comp that you'd like brought over. I would prefer you do it so you learn how cherry-pick works but if advanced git is not your jam that's OK just tell me what to pick over and it'll be done.

JacobyIA commented 6 months ago

I understand how the cherry-pick works. I, again, am simply asking if there are any specific opinions on what commits should or should not be ported over, through any means, because I think that all commits ahead of main/develop should either be ported over or reverted on comp to provide sufficient parity (and yes, there are some commits that probably should not have been directly on comp (including the one you made)).

ZWORX52 commented 6 months ago

Comp is to be deprecated; we are saving what we can from a sinking ship. Eventually we want competitions to run off of main. Here's what I want to save, although I'd prefer you actually do the cherry-pick so you get used to the CLI. Google or ask me on Discord if errors aren't obvious, of course. These are all the auto commits, please include them: 09098e8 auto path fixes 7dea568 Far Middle Auto 9372eee 4N auto time save ec4b1ff slight auto and realignment 60f1947 Intake Deadlines auto 890f876 no move auto 276889d autos, shooter stop redundancy for safety 89d9e19 autoFixes Include these as well, for assorted reasons: 44d154f Increased the number of blinks on intake 3fbd517 Small tolerance change when at base of angle 25a8909 add call to resetShooterShenanigans in Robot.java:teleopInit You know the rest better than I do, but those are the ones I'd like to see. Thank you for your thoughts: 谢谢你.

On 5/15/24 10:40 AM, Jacoby @.***> wrote:

I understand how the cherry-pick works. I, again, am simply asking if there are any specific opinions on what commits should or should not be ported over, through any means, because I think that all commits ahead of |main|/|develop| should either be ported over or reverted on |comp| to provide sufficient parity (and yes, there are some commits that probably should not have been directly on |comp| (including the one you made)).

— Reply to this email directly, view it on GitHub https://github.com/team5735/FRC-2024/issues/21#issuecomment-2112730403, or unsubscribe https://github.com/notifications/unsubscribe-auth/APZGPABYW5PSG7K27BXJ4UTZCNXVNAVCNFSM6AAAAABHSFAE6WVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDCMJSG4ZTANBQGM. You are receiving this because you commented.Message ID: @.***>

JacobyIA commented 6 months ago

All seems good. Just to be clear though, we just want these on main for now, right?

ZWORX52 commented 6 months ago

Oops sorry for late reply. Make a topic branch. Please try to cherry-pick by yourself.

On 5/16/24 12:25 PM, Jacoby @.***> wrote:

All seems good. Just to be clear though, we just want these on main for now, right?

— Reply to this email directly, view it on GitHub https://github.com/team5735/FRC-2024/issues/21#issuecomment-2115680160, or unsubscribe https://github.com/notifications/unsubscribe-auth/APZGPACKJ6XI4GAZXV5Y23DZCTMYBAVCNFSM6AAAAABHSFAE6WVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDCMJVGY4DAMJWGA. You are receiving this because you commented.Message ID: @.***>

JacobyIA commented 5 months ago

Hey, so I went through and did the whole cherry-picking process, and it went fine. However, the decision process of what commits to value over others was not clear to me, and I realized that it may be better to have the person who knows the limelight and auto paths either consult or do it themselves, as I was often unable to tell which version was to be prioritized. I have reset my local progress, and would ask that you either do it yourself or meet with me to discuss (which may no longer be possible due to time).