releng/tickets

Fork 2

Resync branches in nodejs #13320

New issue

Closed

opened 2026-04-20 14:18:50 +00:00 by tjuhasz · 6 comments

tjuhasz commented

2026-04-20 14:18:50 +00:00

Describe the issue

Hello,
would it be possible to forcefully resync f44 branch with rawhide?
Currently inside of nodejs22 there is a deviation from rawhide which creates issues and would be nice if we could resync the commits.

When do you need this? (YYYY/MM/DD)

no deadline.

When is this no longer needed or useful? (YYYY/MM/DD)

always useful.

If we cannot complete this, what is the impact? [Dependencies/Blocker]

no major impact.

Checklist

I have checked existing issues for duplicates
I have filled out all the fields above
I have provided relevant links or references (if applicable)

## Describe the issue Hello, would it be possible to forcefully resync f44 branch with rawhide? Currently inside of [nodejs22](https://src.fedoraproject.org/rpms/nodejs22/commits/f44#) there is a deviation from rawhide which creates issues and would be nice if we could resync the commits. ## When do you need this? (YYYY/MM/DD) no deadline. ## When is this no longer needed or useful? (YYYY/MM/DD) always useful. ## If we cannot complete this, what is the impact? [Dependencies/Blocker] no major impact. --- ## Checklist - [X] I have checked existing issues for duplicates - [X] I have filled out all the fields above - [X] I have provided relevant links or references (if applicable)

jnsamyak commented

2026-04-21 10:19:24 +00:00

Owner

What do you mean by re-sync the branches? What is the use-case here?

We don't rewrite commit history, you can cherry-pick the commits if you like, or revert the commits, pull in the commits from rawhide branch. But not sure what you meant by re-syncing.

What do you mean by re-sync the branches? What is the use-case here? We don't rewrite commit history, you can cherry-pick the commits if you like, or revert the commits, pull in the commits from rawhide branch. But not sure what you meant by re-syncing.

tjuhasz commented

2026-04-21 11:10:10 +00:00

Author

Hi @jnsamyak,
I meant aligning f44 branch with rawhide entirely (commits having the same hash, order, etc.), by force pushing changes from rawhide onto f44.

The use case for us would be that it would allow us to easily merge changes from rawhide to f44 as they should for the foreseeable future contain the exact same code. Currently it would be necessary to cherry-pick commits even though the code should be exactly the same.

Hi @jnsamyak, I meant aligning f44 branch with rawhide entirely (commits having the same hash, order, etc.), by force pushing changes from rawhide onto f44. The use case for us would be that it would allow us to easily merge changes from rawhide to f44 as they should for the foreseeable future contain the exact same code. Currently it would be necessary to cherry-pick commits even though the code should be exactly the same.

jnsamyak commented

2026-05-08 05:03:31 +00:00

Owner

We don't force push to change the commit history for the built RPMs. This would be something that we should take to fesco, but I think this is not something that we do, especially if we have builds associated with certain commits.

CC: @kevin

jnsamyak self-assigned this

2026-05-08 05:03:37 +00:00

jnsamyak added the

labels

2026-05-08 05:04:07 +00:00

kevin commented

2026-05-08 18:27:29 +00:00

Owner

You should be able to just merge rawhide with f44 yourself... is there some reason that won't work for your needs?

Yeah, we do not force push... it breaks everyone who has a checkout, makes it so builds are impossible to match up with what hash they were built with (because they don't exist anymore when it rewrote). You should be able to just merge rawhide with f44 yourself... is there some reason that won't work for your needs?

jnsamyak commented

2026-05-12 17:37:09 +00:00

Owner

@tjuhasz, any thing more we can help you with?