Skip to content

Merge change to 15.x branch#10

Merged
rschu1ze merged 3 commits intoClickHouse:ClickHouse/release/15.xfrom
azat-archive:ch/merge-to-15.x
Mar 19, 2023
Merged

Merge change to 15.x branch#10
rschu1ze merged 3 commits intoClickHouse:ClickHouse/release/15.xfrom
azat-archive:ch/merge-to-15.x

Conversation

@azat
Copy link
Copy Markdown
Member

@azat azat commented Mar 17, 2023

Looks like #8 forgot to merge this to 15.x and simply switch the HEAD in the submodules, let's do this to make the HEAD of the Clickhoues/release/15.x up to date (plus I have one more patch - #9)

Cc: @rschu1ze
Cc: @hanfei1991

@rschu1ze rschu1ze self-assigned this Mar 17, 2023
@rschu1ze
Copy link
Copy Markdown
Member

Nice catch. The PR is good to go once #9 (comment) is clarified ... btw., I couldn't find a corresponding PR in the ClickHouse repo that updates the llvm-project submodule?

@azat
Copy link
Copy Markdown
Member Author

azat commented Mar 17, 2023

The PR is good to go once #9 (comment) is clarified ...

It does not contains anything from #9, so I think it is safe to merge it now.

Plus, I want to rebase on top of that changes (since I want to create a draft PR in ClickHouse that will include not only #9 but also #8)

I couldn't find a corresponding PR in the ClickHouse repo that updates the llvm-project submodule?

It should be ClickHouse/ClickHouse#46600

@rschu1ze rschu1ze merged commit d80af31 into ClickHouse:ClickHouse/release/15.x Mar 19, 2023
rschu1ze added a commit to ClickHouse/ClickHouse that referenced this pull request Mar 19, 2023
(motivated by [0])

PRs [0]/[1] switched the git reference in ClickHouse's main repo to a
feature branch derived from the correct branch
(ClickHouse/releases/15.x). As per this PR, this is now fixed. The
actual code state of llvm-project doesn't change.

[0] ClickHouse/llvm-project#10
[1] ClickHouse/llvm-project#8
[2] #46600
@rschu1ze
Copy link
Copy Markdown
Member

I couldn't find a corresponding PR in the ClickHouse repo that updates the llvm-project submodule?
It should be ClickHouse/ClickHouse#46600

What I meant was whether this PR has an equivalent in the main repo already. But nevermind, here it is: ClickHouse/ClickHouse#47719

@azat
Copy link
Copy Markdown
Member Author

azat commented Mar 20, 2023

What I meant was whether this PR has an equivalent in the main repo already.

Well, it can't be done until this MR merged.

ClickHouse/ClickHouse#47719

Yep, thanks!

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.

3 participants