hans added a comment. In D66556#1648807 <https://reviews.llvm.org/D66556#1648807>, @aganea wrote:
> In D66556#1648591 <https://reviews.llvm.org/D66556#1648591>, @hans wrote: > > > In D66556#1648118 <https://reviews.llvm.org/D66556#1648118>, @dexonsmith > > wrote: > > > > > In D66556#1648109 <https://reviews.llvm.org/D66556#1648109>, @rnk wrote: > > > > > > > I'm not sure what happens, but I see you added .gitattributes. I'd > > > > commit it as is. Buildbots using svn will keep working. You can check > > > > that the monorepo has the right line endings afterwards, and try again > > > > if not. > > > > > > > > > SGTM. > > > > > > This broke users of the monorepo, where the file would show up as having > > changed locally, and with no way to reset it. I'm guessing that's because > > it was checked in with LF endings and then because of the .gitattributes > > file, it changes at checkout. I think the correct solution would be to > > check in the file with CRLF endings and not set any attributes or stuff. > > (Though this is all super confusing and I might have got it wrong.) > > > > I've deleted the test file in r370175 to unblock development in the > > meantime. > > > It already had CRLF endings locally before commit. > It is strange, the file shows up as having CRLF endings in the old revision > in git, before the revert: > https://raw.githubusercontent.com/llvm/llvm-project/9774a2ba279aea35f166b8ca489d0e8292026c38/clang/test/Lexer/minimize_source_to_dependency_directives_invalid_error.c > The same kind of problem occured in rL311683 > <https://reviews.llvm.org/rL311683>, later fixed by rL311732 > <https://reviews.llvm.org/rL311732>. > If you're fine with that, I'll do the same thing: remove `.gitattributes` > and just re-commit the file > `minimize_source_to_dependency_directives_invalid_error.c` with > `svn:eol-style CRLF`. Yes, I think that should work. (But these things always break in surprising ways.) Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D66556/new/ https://reviews.llvm.org/D66556 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
