nridge added a comment.

I would like to apply the updated patch to try it some more, but `arc patch` is 
failing for me.

Applying the raw diff manually with `patch` also fails with the following 
errors:

  $ patch -p1 < ../patches/macro-hover.patch
  patching file clang-tools-extra/clangd/Hover.h
  Hunk #1 FAILED at 71 (different line endings).
  1 out of 1 hunk FAILED -- saving rejects to file 
clang-tools-extra/clangd/Hover.h.rej
  patching file clang-tools-extra/clangd/Hover.cpp
  Hunk #1 FAILED at 641 (different line endings).
  Hunk #2 FAILED at 670 (different line endings).
  Hunk #3 FAILED at 1004 (different line endings).
  Hunk #4 FAILED at 1055 (different line endings).
  Hunk #5 FAILED at 1175 (different line endings).
  5 out of 5 hunks FAILED -- saving rejects to file 
clang-tools-extra/clangd/Hover.cpp.rej
  patching file clang-tools-extra/clangd/unittests/HoverTests.cpp
  Hunk #1 FAILED at 478 (different line endings).
  Hunk #2 FAILED at 1070 (different line endings).
  Hunk #3 FAILED at 1567 (different line endings).
  Hunk #4 FAILED at 1577 (different line endings).
  Hunk #5 FAILED at 1591 (different line endings).
  Hunk #6 FAILED at 2625 (different line endings).
  6 out of 6 hunks FAILED -- saving rejects to file 
clang-tools-extra/clangd/unittests/HoverTests.cpp.rej

I'm guessing related to Windows line endings?


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D127082

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to