the tool launched when we right-click a conflicted file in Windows Explorer, select TortoiseSVN, then select Edit Conflicts. prefab conflict solver actually do? It declared to TortoiseSVN that SmartMerge is the interactive merge tool for those files, i.e. prefab files, this fails nearly every time.ģ. a non-interactive merge), and only then reports the files as conflicted should that fail. Instead, TortoiseSVN automatically attempts a typical text-merge (i.e. prefab files, TortoiseSVN will not automatically launch SmartMerge upon encountering a versioning conflict for those files (i.e. Even after setting TortoiseSVN to use SmartMerge for. Also note that if SmartMerge is launched without the first argument being merge, then SmartMerge assumes an SVN client is launching it and thus expects exactly five arguments, where the first four are the files needed for merging and the last is the "wcfile", which doesn't seem to matter so I just pass in "foo".Ģ. "C:/Program Files/Unity/Unity542f2/Editor/Data/Tools/UnityYAMLMerge.exe" %base %mine %theirs %merged fooīe sure to change the path to wherever your SmartMerge is located. Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-mergetool-lib: line 133: 97036 Segmentation fault: 11 /Applications/Unity_5.5.0b4/Unity.app/Contents/Tools/UnityYAMLMerge merge -p -describe -timing $BASE $REMOTE $LOCAL $MERGEDĮclair/Assets/Dynamic/Scenes/GachaScene.unity seems unchanged. Normal merge conflict for 'Eclair/Assets/Dynamic/Scenes/GachaScene.unity': Tims-mbp:Eclair tim$ git mergetool Eclair/Assets/Dynamic/Scenes/GachaScene.unityĮclair/Assets/Dynamic/Scenes/GachaScene.unity The remaining one fails with the slightly less useful: Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-mergetool-lib: line 133: 96899 Abort trap: 6 /Applications/Unity_5.5.0b4/Unity.app/Contents/Tools/UnityYAMLMerge merge -p -describe -timing $BASE $REMOTE $LOCAL $MERGEDĮclair/Assets/Dynamic/Core/Prefabs/TopPanelCanvas.prefab seems unchanged. Libc++abi.dylib: terminating with uncaught exception of type std::runtime_error: Cannot find transform parent for fileID Most files merge fine, these are rare exceptions. To confirm, this is using the tool from Unity 5.5.0b4, although the project the files are in is Unity 5.3.4p2. If we can change the files to workaround the crash, that would be great. I was hoping you could look into them for us. I'm figuring they're triggering edge case bugs with the tool. However, out of several dozen files, it fails on three. This is very exciting, since scene merges have been a real problem for us. I wasn't able to get unityyamlmerge working until 5.5, but the version with the beta is working for almost all of my scene and prefab files. PS.: This is my first post here at Unity forums =P Maybe I can send you my conflicted scene so you can check it out? I have no idea where to even start reporting this, IF one or any of these are a bug. On this last attempt, I also noticed that right before opening the merge tool, it was using 500MB of memory, and during the 7 minutes it was working it used 15 to 20% of my processor. Another surprise, all three files were empty. This last time it took more than 5 minutes to do the merge, reported (correctly) 1 conflict in an integer attribute, and after another 2 minutes waiting it opened the fallback merge tool. =/Īfter that I tried once again, reconfigured everything, reverted my merge and did it again. 100% reproduceable, I tried 3+ times and it crashed on all of them. But, for my surprise, my merge tool (I tried with tortoiseGitMerge and Per4Merge) reported that there were no differences whatsoever between any of the files (base, mine or theirs).Īfter trying to reconfigure everything and restarting my computer (who knows) I tried again with the exact same scene merge and, for my surprise, UnityYAMLMerge crashed. Get the setup working was actually pretty easy, but then the problems started.įirst thing I noticed was that it took like 40 seconds to parse my scene (its a 55k line file, 2.3MB, so it looked ok).Īfter that, UnityYAMLMerge reported (correctly) 1 conflict in an integer attribute, and tried to open the three way diff in my fallback merge tool (and that took another 40 seconds to happen). Today I tried really hard (for something like 4 hours) try to make UnityYAMLMerge work with tortoiseGit.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |