Rolling, Iron, master branch out-of-sync

[JanStaschulat]

@pablogs9 @Acuadros95

For some unclear reason, the master, rolling, and iron branch are out-of-sync, when I use the github compare function:

comparison rolling - master https://github.com/ros2/rclc/compare/rolling...master

comparison iron - rolling https://github.com/ros2/rclc/compare/iron...master

comparison iron - rolling https://github.com/ros2/rclc/compare/rolling...iron

However, I compared with kdiff3 manually the entire repository (I cloned rclc twice and switched to different branches):

• master vs rolling
• master vs iron
• iron vs rolling

and they are perfectly the same. The only difference is ci.yml regarding the branch-, CI-, and distribution- names. Which is okay. So my understanding is. all the branches are in-sync but the Github compare function reports 3 commit differences... I think, we should have a clean setup before creating an iron release. Any ideas, how to fix this?

A brute-force and simple solution would be:

• Delete iron and rolling branch and copy them over from master again?

[pablogs9]

Indeed, they are separated:

Feel free to force-push them to the correct commit, as far as I understand right now they shall be pointing to the same commit right?

[JanStaschulat]

They should not point to the same commit, because the ci.yml is different. For each branch the ci uses the corresponding distribution names, aka rolling for rolling branch, iron for iron branch, and so on.

But regarding the source code ( last two pull requests in package rclc_parameter, rclc ) they are the same.

[JanStaschulat]

@pablogs9 . You meant to force push the master branch to rollingand iron branch like this?

$git checkout master
$git push origin --force master:rolling
$git push origin --force master:iron

... and then I would have to re-do the update of the distribution names in ci.yml in the rolling and iron branch.

[pablogs9]

Nor sure about your approach, I would do:

# Move to iron
git checkout iron
# Move iron to origin/rolling
git reset --hard origin/rolling
# Push force
git push --force

But if they have differences, I'm not sure about doing so.