See also UE-43603 to cover handling this case fully correctly, cloned from this issue which is specifically to avoid the crash.
A UDN user found a crash in the merge tool when using SVN.
https://udn.unrealengine.com/questions/265740/crashbug-with-svn-merging.html
The failing check() crash occurs in LoadBaseRev (Merge.cpp):
TSharedPtr<ISourceControlRevision, ESPMode::ThreadSafe> Revision = SourceControlState.GetBaseRevForMerge();
check(Revision.IsValid()); /// <- This fails
This is because SourceControlState.GetBaseRevForMerge() returns a null ISourceControlrevision. Which is because FSubversionSourceControlState::PendingMergeBaseFileRevNumber is not a valid revision for the particular file that is merging. The PendingMergeBaseFileRevNumber revision appears to be "head - 1" but the revision history array may not contain an entry for this as there may be gaps in the revision sequence for a particular file.
Perform a merge on a Blueprint that has gaps in its revision sequence in its history.
How does TextureRenderTarget2D get TArray<uint8> type data?
How do I set a material as a post-processing material?
Why does the REMOVE method of map container remove elements have memory leaks?
How to delete some elements correctly when deleting an array loop?
UMG RichText not appear image when packaged
What is the difference between Camera and CineCamera?
What is the cause of the packaging error falling back to 'GameUserSettings' in ue5?
How does TArray loop correctly remove elements in blueprints?
There's no existing public thread on this issue, so head over to Questions & Answers just mention UE-22428 in the post.
| 1 |
| Component | UE - Gameplay - Blueprint Editor |
|---|---|
| Target Fix | 4.16 |
| Created | Oct 21, 2015 |
|---|---|
| Resolved | Apr 4, 2017 |
| Updated | Dec 12, 2023 |