Closed danielkcz closed 7 years ago
Hi, yes I was able to make it work, but it was on an old Engine version. Which one are you using ? Is it a binary version from the launcher ?
I will try to have a look at it, but not today as don't have my computer with me.
Yes, I am using latest UE 4.14.1 from the launcher.
Hi @FredyC, I did reproduce the problem, and looking into it I am not sure it has ever worked.
I will try to work into it soon, but I cannot promise that when it would get integrated into UE.
Sorry about that!
@SRombauts Thanks, at least there is a hope for brighter future :)
Also, it appears that this problem has already been reported in AnswerHub (Git LFS Diff not working and is officially tracked as issue UE-34539 in Epic Games JIRA
I actually recently submitted EpicGames/UnrealEngine#3057 which solves this as well.
Hi @rpav, this is a really good news, and perfectly on time! I'll check what you submitted asap, and will report here and on the Merge Request itself. Cheers!
Your solution is working and elegant! I hope we could get it in quickly.
@rpav, I have added a commit on my git-plugin-smudge-diffs branch with some small improvements:
Could you cherry-pick this onto your merge request branch please?
Done!
And good to hear, I was pretty hesitant to touch this as source control stuff is terribly project-critical. Huge thanks for the plugin in general, it works great and I'd rather not manage perforce. ;)
Thank you very much for your work, I've also referenced your Pull Request in the AnswerHub bug report Git LFS Diff not working.
Let's hope for a quick integration in the Engine. UE4.15 would have been nice, but it's probably already too late... Edit: target fix has been set to UE4.16 on the issue tracker
I'll close this issue only when it will be integrated.
Cheers!
Thank you both for actively handling this. Looking forward for this to be at least integrated into a master branch. Do I actually need something else to make it working or just to build the UE from the source?
You only have to build from source, nothing else.
The topic is not closed, I found an issue with the solution, and rpav had to rethink it into a new pull-request EpicGames/UnrealEngine#3253 which will work only with latest git 2.11 (29 nov. 2016)
Merge 3 days ago in Epic Games master, in time for UE4.16
I started using the plugin on a small project, but I seem to unable make a diff working. I am using LFS for all
*.uasset
and*.umap
files since start of the project, but that should be working as per readme, right?I am on Windows 10 x64. git version 2.10.1.windows.1 git-lfs/1.5.2 (GitHub; windows amd64; go 1.7.3; git 547a06aa)