Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.
This repository was archived by the owner on Jun 5, 2025. It is now read-only.

Not all already merged diffs are detected in a stacked diff #181

@konstantinschwarz

Description

@konstantinschwarz

I created a stacked diff in https://reviews.llvm.org/D78319
The first two patches have been merged in the meantime, while I'm still working on D78319.
When updating that revision, the apply-patch script correctly detects that D78318 already landed, but still tries to apply D78316:
[2020-05-11T11:48:46.327Z] Already landed: D78318
[2020-05-11T11:48:46.327Z] Will be applied: D78316

This results in an unable to apply error:
[2020-05-11T11:48:46.327Z] Exception: Applying patch failed:
[2020-05-11T11:48:46.327Z] error: patch failed: llvm/lib/Target/AArch64/AArch64Subtarget.h:19
[2020-05-11T11:48:46.327Z] error: llvm/lib/Target/AArch64/AArch64Subtarget.h: patch does not apply
...

Metadata

Metadata

Labels

bugSomething isn't working

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions