emanzione / PATCH

The PATCH repository for issues tracking, wiki and shared material.
https://assetstore.unity.com/packages/tools/utilities/p-a-t-c-h-ultimate-patching-system-41417
MIT License
47 stars 6 forks source link

Tortoise SVN unable to commit asset files #7

Closed PaulIndrome closed 5 years ago

PaulIndrome commented 5 years ago

Recently purchased the editor extension and need to include it in our repo. Unity2018.2.10f1, Windows 10, building for PC and (in the future if we ever get to it) iOS, using Subversion for version control (client: TortoiseSVN).

However, using Tortoise SVN, I am getting the following error when trying to commit the entire MHLab folder: subversion-patch-issue-01

Addendum2: I have isolated the error to these three files. All progressbar prefabs. subversion-patch-issue-04

Weirdly enough, after the first time this error occurred, some files were set from "non-versioned" to "added" and committed just fine. I am, however, stuck with the non-versioned files. Just in case you can tell anything from the file list:

subversion-patch-issue-02

Addendum0: After some mucking about, trying to manually add all the non-versioned files, TortoiseSVN showed some more information about the files affected: subversion-patch-issue-03

It seems this has something to do with the scenes.

Addendum1: Oooooooor maybe not. The Progressbar.prefab seems to be the culprit here. subversion-patch-issue-01

PaulIndrome commented 5 years ago

The issue has been resolved.

I fixed it by reverting changes to the subversion config file I've made in accordance with guides and resources on the internet for setting up Unity's YAMLSmartMerge (which I have little use of atm). My memory of having made these adjustments was sparked when regular prefabs I made myself were showing the same error when trying to add them to the repo.

The following lines in the file may have been the culprits: image I am, however, still not entirely sure why this problem has only started occuring recently and why *.unity files weren't affected as well.