git llvm push errors

I am trying to use git llvm push and am getting some odd errors that seem somewhat common after looking at other email chains but I’m not sure if a solution has been found.

The errors are No such file or directory when clearly the file exists. And also a "new blank line at EOF.\n+’ but I’ve checked both files and there is no blank line at EOF.

  • Ryan

It has been a while since I’ve seen “No such file or directory” although I do still occasionally see “Patch doesn’t apply”

In some apparently relatively rare situations, the svn cache gets messed up and needs to be recreated from scratch.

In all cases, the workaround has been rm –rf .git/llvm-upstream-svn and then the next git llvm push will repopulate it.

If that doesn’t work, then you need expert help from the git-llvm developers.

What I’ve told my team is, if it’s not very common and the repopulate works, just live with it, because the whole thing goes away when we pull the trigger on the final github conversion stage, which is less than 6 months away.

–paulr

Thanks Paul but I saw that on a previous email chain and tried it, it did not work for me. I also saw there are issues with svn tags on some files?

Thanks,

Ryan

It’s both “No such file or directory” and “Patch does not apply”

Creating svn staging directory: (.git/llvm-upstream-svn)
svn staging area ready in ‘.git/llvm-upstream-svn’
Pushing 1 commit:
4e1be4c8956 [AMDGPU] Increases available SGPR for Calling Convention
git apply -p1 - returned 1
b’error: lib/Target/AMDGPU/AMDGPUCallingConv.td: No such file or directory\nerror: lib/Target/AMDGPU/AMDGPUISelLowering.cpp: No such file or directory\n:345: new blank line at EOF.\n+’
Patch doesn’t apply: maybe you should try git pull -r first?

Thanks,

Ryan

This looks like you’re using the wrong repository. The ‘git llvm’ command only works with the new repository layout. Please clone https://github.com/llvm/llvm-project/ instead.

Ah, ok, thanks. That makes sense.

I must have missed the place where that was documented.

So this is based on a hard coded location? The lib/Target/AMDGPU is still in the same place relative to where I was calling git llvm push. Admittedly, I’m not familiar with the script nor really the new layout structure.

  • Ryan

It’s not in the same place – in the new layout, the path is llvm/lib/Target/AMDGPU, instead of lib/Target/AMDGPU (from the root of the repository).