[llvm-dev] git llvm push errors

[Ryan Taylor via llvm-dev]

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<stdin>:345: new blank line at EOF.\n+'
Patch doesn't apply: maybe you should try `git pull -r` first?

Thanks,

Ryan

On Tue, May 14, 2019 at 2:13 PM Ryan Taylor <ryta1203 at gmail.com> wrote:

> 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
>
>
> On Tue, May 14, 2019, 1:30 PM <paul.robinson at sony.com> wrote:
>
>> 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
>>
>>
>>
>> *From:* llvm-dev [mailto:llvm-dev-bounces at lists.llvm.org] *On Behalf Of *Ryan
>> Taylor via llvm-dev
>> *Sent:* Tuesday, May 14, 2019 12:39 PM
>> *To:* llvm-dev
>> *Subject:* [llvm-dev] 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
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20190514/c4a4f4b4/attachment.html>