From d359bbd1a44e36b207ce3699b9d4edb6807a5d2d Mon Sep 17 00:00:00 2001 From: Paschalis Mpeis Date: Wed, 7 May 2025 20:39:17 +0100 Subject: [PATCH 1/3] [llvm][docs] Improve usage note on stacked PRs --- llvm/docs/GitHub.rst | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/llvm/docs/GitHub.rst b/llvm/docs/GitHub.rst index de0022e518cc8..3eb8560c3d877 100644 --- a/llvm/docs/GitHub.rst +++ b/llvm/docs/GitHub.rst @@ -288,16 +288,15 @@ Your options are as follows: in ``llvm/llvm-project``. .. note:: - When not using user branches, GitHub will not display proper diffs for + When using the second approach, GitHub will not display proper diffs for subsequent PRs in a stack. Instead, it will show a combined diff that includes all commits from earlier PRs. - As described in the first option above, in such cases it is the PR author’s - responsibility to clearly indicate which commits are relevant to the - current PR. For example: “The first N commits are from the base PR.” + As described above, it is the PR author’s responsibility to clearly indicate + which commits are relevant to the current PR. + For example: “The first N commits are from the base PR.” - You can avoid this issue by using user branches directly in the - ``llvm/llvm-project`` repository. + You can avoid this issue by using the first or the third approach. Using Graphite for stacked Pull Requests From 8997d0f03b78ee1e9530fc8c6439968ea39e4c22 Mon Sep 17 00:00:00 2001 From: Paschalis Mpeis Date: Wed, 7 May 2025 21:00:22 +0100 Subject: [PATCH 2/3] Addressing reviewers --- llvm/docs/GitHub.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/llvm/docs/GitHub.rst b/llvm/docs/GitHub.rst index 3eb8560c3d877..8ff9bcc596026 100644 --- a/llvm/docs/GitHub.rst +++ b/llvm/docs/GitHub.rst @@ -288,15 +288,16 @@ Your options are as follows: in ``llvm/llvm-project``. .. note:: - When using the second approach, GitHub will not display proper diffs for - subsequent PRs in a stack. Instead, it will show a combined diff that - includes all commits from earlier PRs. + When using the dependency notes approach, GitHub will not display proper + diffs for subsequent PRs in a stack. Instead, it will show a combined diff + that includes all commits from earlier PRs. As described above, it is the PR author’s responsibility to clearly indicate which commits are relevant to the current PR. For example: “The first N commits are from the base PR.” - You can avoid this issue by using the first or the third approach. + You can avoid this issue by using user branches directly in the + ``llvm/llvm-project`` repository. Using Graphite for stacked Pull Requests From b26255647c805d73aeedbae5d78a43af8d147056 Mon Sep 17 00:00:00 2001 From: Paschalis Mpeis Date: Thu, 15 May 2025 12:04:59 +0100 Subject: [PATCH 3/3] Addressing reviewers (2) --- llvm/docs/GitHub.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/docs/GitHub.rst b/llvm/docs/GitHub.rst index 8ff9bcc596026..31dee0bbb17ba 100644 --- a/llvm/docs/GitHub.rst +++ b/llvm/docs/GitHub.rst @@ -288,9 +288,9 @@ Your options are as follows: in ``llvm/llvm-project``. .. note:: - When using the dependency notes approach, GitHub will not display proper - diffs for subsequent PRs in a stack. Instead, it will show a combined diff - that includes all commits from earlier PRs. + When not using user branches, GitHub will not display proper diffs for + subsequent PRs in a stack. Instead, it will show a combined diff that + includes all commits from earlier PRs. As described above, it is the PR author’s responsibility to clearly indicate which commits are relevant to the current PR.