[PATCH] D124774: [clang][ASTImporter][NFC]: Move clang::ImportError into own header.

Gabor Marton via Phabricator via cfe-commits cfe-commits at lists.llvm.org
Thu May 5 07:21:49 PDT 2022


martong added a comment.

In D124774#3493868 <https://reviews.llvm.org/D124774#3493868>, @balazske wrote:

> The code looks correct but the diff is not OK. I think that you have separate commits for every change (instead of changing the first with `git commit --amend` when a new change is made). In this case `arc diff --update <ID> main` may work (if you have a separate branch for the changes). (I did not found a place in LLVM docs where this part of the process is exactly described.)

Yes, you should see that your baseline is valid. Below, the highlighted commit does not exists in the remote (in the upstream repository). 
F22978398: image.png <https://reviews.llvm.org/F22978398>

I suggest the following.

  git remote add llvm git at github.com:llvm/llvm-project.git
  git fetch llvm
  git rebase -i llvm/main //choose your relevant commits
  arc diff --update D124774 llvm/main


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D124774/new/

https://reviews.llvm.org/D124774



More information about the cfe-commits mailing list