Skip to content

chore: Branch main merging master and 2.4.8-windows-stable#578

Open
vandelvan wants to merge 8 commits intoLinearTapeFileSystem:mainfrom
vandelvan:main
Open

chore: Branch main merging master and 2.4.8-windows-stable#578
vandelvan wants to merge 8 commits intoLinearTapeFileSystem:mainfrom
vandelvan:main

Conversation

@vandelvan
Copy link
Copy Markdown
Member

Summary of changes

This pull request includes following changes or fixes.

Description

Merged contributions from master that were missing on the 2.4.8-windows-support branch, leaving out PRs that were merged without the proper approvals and unstable changes to only maintain one main stable branch and keep the master branch as the development branch for the 2.5 spec implementation it has been for the past few years.

Type of change

  • Branch creation/merge

@vandelvan vandelvan self-assigned this Mar 25, 2026
@vandelvan
Copy link
Copy Markdown
Member Author

Checks failing due to argument difference between master branch and 2.4's TAPEDRIVE macro, looking into it...

Copy link
Copy Markdown

@chukero chukero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved

Copy link
Copy Markdown
Collaborator

@syaoraang syaoraang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to go!

Copy link
Copy Markdown

@rangelmx rangelmx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@Piloalucard
Copy link
Copy Markdown
Member

LGTM!

@amissael95
Copy link
Copy Markdown
Contributor

Hello @vandelvan, how was the "main" branch of your repo created?
https://github.com/vandelvan/ltfs/commits/main

That is different from the master and the main branch of this repo:
https://github.com/LinearTapeFileSystem/ltfs/commits/main
https://github.com/LinearTapeFileSystem/ltfs/commits/master

For me, it looks like you picked the commits that you considered not part of the v2.5 development:

image

Is that true? if yes, how did you confirmed that not other change is needed?

In addition, those commits would represent untested functionality with the current release version https://github.com/LinearTapeFileSystem/ltfs/releases/tag/v2.4.8.2-10520. We need to consider it for the next one.

@Piloalucard
Copy link
Copy Markdown
Member

Hello @vandelvan, how was the "main" branch of your repo created? https://github.com/vandelvan/ltfs/commits/main

That is different from the master and the main branch of this repo: https://github.com/LinearTapeFileSystem/ltfs/commits/main https://github.com/LinearTapeFileSystem/ltfs/commits/master

For me, it looks like you picked the commits that you considered not part of the v2.5 development:

image Is that true? if yes, how did you confirmed that not other change is needed?

In addition, those commits would represent untested functionality with the current release version https://github.com/LinearTapeFileSystem/ltfs/releases/tag/v2.4.8.2-10520. We need to consider it for the next one.

Hello @amissael95 I think that is the effort for this PR and PR review. Everyone reviewing this should address invididually each commit and compare the 'master' branch against '2.4.8' and let know about our concerns of added or deleted code.

@vandelvan
Copy link
Copy Markdown
Member Author

vandelvan commented Apr 6, 2026

Hi @amissael95

As stated in the description, this PR merges contributions from master that were missing on the 2.4.8-windows-support branch, leaving out PRs that were merged without the proper approvals and unstable changes.
Aiming to only maintain one main stable branch and keep the master branch as the development branch for the 2.5 spec implementation it has been for the past few years.

I also did perform an additional change in the last commit to ensure compatibility, no checks are failing as you can see.

@amissael95
Copy link
Copy Markdown
Contributor

@vandelvan correct, but that did not answer the question "how did you confirmed that not other change is needed?" in other words, did you use a specific git command or did you looked at the PRs manually and decided what to include based in your experience?

Could you elaborate more what you did? That information is useful in order to understand if we could be missing something.

In addition, I would recommend to change the following wording "Merged contributions from master.." since the "master" branch is not directly merged in this PR, reading it and then realized that only "main" branches are used could be confuse.

@vandelvan
Copy link
Copy Markdown
Member Author

@amissael95

Cherry picked commits from master into main which uses 2.4.8-windows-support as base so it is currently the same branch with another name, only left out the following PRs:

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.

10 participants