Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo #224

Closed
wants to merge 1 commit into from
Closed

Fix typo #224

wants to merge 1 commit into from

Conversation

christianrauch
Copy link

Summary

Fix a typo.

Impact

None.

Testing

None.

@MaEtUgR
Copy link
Member

MaEtUgR commented Mar 20, 2023

@christianrauch christianrauch changed the base branch from px4_firmware_nuttx-10.3.0+ to master March 20, 2023 18:32
@christianrauch
Copy link
Author

Probably best to suggest this commit on the upstream repo here: https://github.com/apache/nuttx/blob/13d823f30710e6fabd3d6429a03bc37e1086c9e7/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c#L184

This repo (https://github.com/PX4/NuttX) does not seem to be a fork of the upstream repo (https://github.com/apache/nuttx). Are the repos automatically sinced?

@christianrauch
Copy link
Author

apache/nuttx#8855

@MaEtUgR
Copy link
Member

MaEtUgR commented Mar 20, 2023

does not seem to be a fork of the upstream repo

It is but doesn't show as usual in Github. Most likely because it was forked before NuttX came to GitHub through Apache. Before it was on bitbucket. But the description of https://github.com/PX4/NuttX clearly writes it's a fork on the right side:
image

Are the repos automatically synced?

I think it's a manual process. If you want to have the change in PX4 just create a pull request here following the [BACKPORT] original commit message when it's merged upstream. That's actually what I'm doing as well right now and why I saw your change 😉 If you look at the history of https://github.com/PX4/NuttX/commits/px4_firmware_nuttx-10.3.0%2B there's the clear pattern for backports ending on the second page.

@christianrauch
Copy link
Author

The upstream PR has been merged via apache/nuttx@f578149. In my opinion, it is too much effort to create yet another PR just to get this one-character change merged. It would be much easier to maintain the software if you would use the upstream project.

Bu then, as far as I can see, the master branches are already synchronous. So I don't really see why commits have to be backported manually. If the fork relation would be known in GitHub, you could sync easily using the web interface. But without this, you can still just pull-and-push without the need to resolve conflicts.

@christianrauch christianrauch deleted the fix_typo branch March 20, 2023 23:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants