Skip to content

Backport #113446 to 19.x #115827

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

Closed
anutosh491 opened this issue Nov 12, 2024 · 16 comments
Closed

Backport #113446 to 19.x #115827

anutosh491 opened this issue Nov 12, 2024 · 16 comments
Labels
clang Clang issues not falling into any other category cmake Build system in general and CMake in particular release:backport

Comments

@anutosh491
Copy link
Contributor

anutosh491 commented Nov 12, 2024

Hi,

I am interested in a PR #113446 that I would like to have in the release (if possible in 19.1.4)
The PR works towards allowing clang-repl to run in the browser. It is a small but essential change.

@anutosh491
Copy link
Contributor Author

cc @aheejin

@aheejin
Copy link
Member

aheejin commented Nov 12, 2024

You can request for a backport merge with this process: https://llvm.org/docs/GitHub.html#backporting-fixes-to-the-release-branches

@anutosh491
Copy link
Contributor Author

/cherry-pick d61f58f

@anutosh491
Copy link
Contributor Author

You can request for a backport merge with this process

Thanks. I hope should be enough (I thought it is only a maintainer that could probably pick commit for a release)

@aheejin
Copy link
Member

aheejin commented Nov 12, 2024

I am not a release maintainer either 😀

@llvmbot
Copy link
Member

llvmbot commented Nov 12, 2024

/cherry-pick d61f58f

Error: Command failed due to missing milestone.

@aheejin
Copy link
Member

aheejin commented Nov 12, 2024

/cherry-pick d61f58f

Re-posting this after adding the milestone

@llvmbot
Copy link
Member

llvmbot commented Nov 12, 2024

Failed to cherry-pick: d61f58f

https://github.com/llvm/llvm-project/actions/runs/11793878279

Please manually backport the fix and push it to your github fork. Once this is done, please create a pull request

@llvmbot
Copy link
Member

llvmbot commented Nov 12, 2024

Failed to cherry-pick: d61f58f

https://github.com/llvm/llvm-project/actions/runs/11793890929

Please manually backport the fix and push it to your github fork. Once this is done, please create a pull request

@anutosh491
Copy link
Contributor Author

Hi @tru

Could you maybe tell us if we're doing something wrong here. Just did what the docs suggested.

@aheejin
Copy link
Member

aheejin commented Nov 12, 2024

It says the cherry-pick failed because of conflicts. I think you should locally do a cherry-pick of the commit on top of release/19.x branch, resolve conflicts, test if it works well, and create a PR against the release/19.x branch as the doc says.

@tru
Copy link
Collaborator

tru commented Nov 12, 2024

What @aheejin said. There are conflicts so you need to manually resolve those.

@anutosh491
Copy link
Contributor Author

anutosh491 commented Nov 12, 2024

Well I don't think I have a conflicts issue. I am seeing this (https://github.com/llvm/llvm-project/actions/runs/11793878279)

git.exc.GitCommandError: Cmd('git') failed due to: exit code(128)
  cmdline: git cherry-pick -x d61f58f66839652ec4c1101521c2a7297cffacff
  stderr: 'fatal: bad object d61f58f66839652ec4c1101521c2a7297cffacff'
  

Not sure if directly creating a PR against the release/19.x works.

@anutosh491
Copy link
Contributor Author

Here's one with the same changes as d61f58f
#115846

Not sure I could do a cherry pick as @aheejin suggested.

@aheejin
Copy link
Member

aheejin commented Nov 12, 2024

/cherry-pick 075581f

#113446's commit is 075581f. I think we should cherry-pick this one

@llvmbot
Copy link
Member

llvmbot commented Nov 12, 2024

/pull-request #115848

@EugeneZelenko EugeneZelenko added cmake Build system in general and CMake in particular clang Clang issues not falling into any other category release:backport and removed new issue labels Nov 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang Clang issues not falling into any other category cmake Build system in general and CMake in particular release:backport
Projects
Development

No branches or pull requests

5 participants