koobas.hobune.stream
Asset Server - Revert/Ignore an Update
How do you ignore or revert an update/commit when using Asset Server?
Example:
We have a LARGE folder named GUI that contains hundreds of images.
We decided we'd like to rename the folder (if possible).
My co-worker, Fred, makes the change to his working copy then commits revision 5000
Revision 5000 breaks all the project's associations that were made in the inspector
Because the commit was harmful, I obviously do not want to do an update. What should I do?
The most obvious thing to me was to have Fred revert his working copy back to the last safe revision (r4999) and commit again. We did this, but Asset Server is not allowing him to commit after reverting. Asset Server wants both Fred and I to update to revision 5000.
Updating to revision 5000 will take over 10 minutes and will break my project!
Rename the folder on your side before making the update. IMPORTANT: rename it WITHIN UNITY, not via Finder/Explorer externally (I assume this is what Fred did? So his commit contains a "delete" and many "new" entries, instead of a "move" entry? If not, please clarify this before proceeding!)
Renaming it in your working copy will create a conflict on update. Now you can update, and simply select "Ignore server changes" for that folder, once the conflict window appears.
Or manipulate the asset server directly:
From within Unity you cannot ignore/delete a commit. But on the machine holding the asset server there should be some ways to administer the database directly, maybe it's possible to delete the latest commit there directly, not sure.
I just followed your advice. Unfortunately Fred had made another commit which attempted to change the folder back to its original name. This caused some nasty side effects :(
The old folder was named GUI. He changed it to Graphics in r5000. He made a couple attempts to fix the problem, the last of which involved a commit that changed the name back to GUI. I changed the folder's name to GUIx on my working copy then tried an update. I chose to ignore the changes on the server. When the update was complete I had an empty folder named GUIx and a folder named GUI with all the old assets in it, but in their raw state: they all need to have their settings changed and none of the inspector associations are in tact. Once I saw that was all bad I reverted my working copy to r4999, which is where I'm at right now.
So... I reverted my working copy ro r4999. Then I changed the folder's name to Graphics (which was what we originally set out to do). Then I clicked update and chose to ignore server changes. I'm currently waiting for that 10 $$anonymous$$ute update to complete. Hopefully when I get back from lunch there will be a Graphics folder and a GUI folder. I'll delete the GUI folder, commit, and will hopefully be back to development.
