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

[stable29] fix(files): ensure valid mtime and fallback to crtime if defined #49283

Open
wants to merge 2 commits into
base: stable29
Choose a base branch
from

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Nov 14, 2024

Backport of #49225

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Remove all the empty commits

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@solracsf

This comment was marked as outdated.

@solracsf solracsf marked this pull request as ready for review December 14, 2024 14:08

This comment was marked as resolved.

@backportbot backportbot bot force-pushed the backport/49225/stable29 branch from 756d099 to f77fd9f Compare December 14, 2024 14:16
@skjnldsv
Copy link
Member

@solracsf you need to rebase before compiling
image

@skjnldsv

This comment was marked as resolved.

@skjnldsv skjnldsv force-pushed the backport/49225/stable29 branch from f77fd9f to c47e56f Compare December 14, 2024 14:21
@skjnldsv skjnldsv enabled auto-merge December 14, 2024 14:21
@solracsf
Copy link
Member

solracsf commented Dec 14, 2024

@skjnldsv why /compile rebase doesn't seem to work (at least my attempts always fail...)? 🤔

@solracsf
Copy link
Member

...and backport seems incomplete... 🔴

@skjnldsv skjnldsv force-pushed the backport/49225/stable29 branch from 4607651 to c47e56f Compare December 15, 2024 12:53
@skjnldsv skjnldsv force-pushed the backport/49225/stable29 branch from c47e56f to 3466bdd Compare December 15, 2024 12:53
@skjnldsv
Copy link
Member

skjnldsv commented Dec 15, 2024

@skjnldsv why /compile rebase doesn't seem to work (at least my attempts always fail...)? 🤔

depends on the commit history.
If there is one empty commit (like a leftover compile), it might fail to rebase yep

But you can also use GH rebase feature at the bottom (not the merge-update, but the rebase-update)
image

@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 15, 2024
@skjnldsv skjnldsv requested a review from solracsf December 15, 2024 12:55
@skjnldsv
Copy link
Member

/compile amend

Signed-off-by: nextcloud-command <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants