x


Unity 3.5 SVN and ProjectSettings.asset

I have Unity set to external source control and am using SVN. Everything works fine with one exception:

The ProjectSettings/ProjectSettings.asset file changes every time I even just open the project. This causes conflicts if I don't update before opening the project.

Is there a solution to this?

more ▼

asked Jul 31 '12 at 08:40 PM

Hotshot10101 gravatar image

Hotshot10101
146 6 8 17

I finally got around to doing a binary diff on the files and found that there are only 2 bytes that changed near the end of the file. Seems kind of silly to do that causing SVN issues when you really don't need it (as far as I can tell).

The 2 bytes are at location 0x2e57-0x2e58. In the OSX version the bytes are 0x00 0x00 and in the Windows version they are 0x14 0x02.

Anyone have any idea why?

Oct 09 '12 at 05:01 PM Hotshot10101
(comments are locked)
10|3000 characters needed characters left

6 answers: sort voted first

methinks something in project changes this file...

switch Asset Serialization to "Force Text". this will let you:

  • merge changes

  • detect what exactly is changing every time you open a project

more ▼

answered Aug 07 '12 at 08:04 PM

ScroodgeM gravatar image

ScroodgeM
7.6k 2 6

I didn't realize there was a way to force binary files to be text. This is great. I much prefer text files to binary. I know there are down sides, but love the up sides so much more.

At least then I will be able to find out what is changing.

Aug 07 '12 at 08:18 PM Hotshot10101
(comments are locked)
10|3000 characters needed characters left

I would also like to know how to handle this.

more ▼

answered Aug 07 '12 at 08:01 PM

patrickkidd gravatar image

patrickkidd
6 7 7 11

(comments are locked)
10|3000 characters needed characters left

On a project we're working on I just set that file (and qualitysettings.asset) to be ignored by SVN once everybody had an initial version. I'm not sure exactly why it feels the need to change so often, but that resolved all of our conflicts.

more ▼

answered Aug 07 '12 at 08:02 PM

wilco64256 gravatar image

wilco64256
150 6 13 18

I have done this kind of thing on other projects (not Unity) as well. Especially with Eclipse C/C++ projects for NIOS. They store a lot of user specific stuff in their project files, so we actually have a separate project files folder that we keep.

Not a great solution, but it would work.

Aug 07 '12 at 08:17 PM Hotshot10101
(comments are locked)
10|3000 characters needed characters left

@Scroodge: I didn't realize there is a force text option. I always prefer text based files to binary anyway. Thank you. At least then I will know what is going on.

@wilco64256: I certainly thought about doing this and have done that on other unrelated projects that use Eclipse and C/C++. If I need to I can do that, but it just doesn't feel right to not have a file needed for a clean check out in source control. You probably know what I mean :-)

more ▼

answered Aug 07 '12 at 08:23 PM

Hotshot10101 gravatar image

Hotshot10101
146 6 8 17

(comments are locked)
10|3000 characters needed characters left

I am still hopeful that there is some setting somewhere that will make it so that just opening the project doesn't modify the project files.

more ▼

answered Aug 07 '12 at 08:23 PM

Hotshot10101 gravatar image

Hotshot10101
146 6 8 17

just find a setting that changes. i work in some projects with a lot of different data in Assets and no ignoring anything in Project Settings. so i'm sure there's not a hard task to solve it 8) find it 8)

Aug 07 '12 at 08:28 PM ScroodgeM
(comments are locked)
10|3000 characters needed characters left
Your answer
toggle preview:

Up to 2 attachments (including images) can be used with a maximum of 524.3 kB each and 1.0 MB total.

Follow this question

By Email:

Once you sign in you will be able to subscribe for any updates here

By RSS:

Answers

Answers and Comments

Topics:

x268
x128
x50

asked: Jul 31 '12 at 08:40 PM

Seen: 727 times

Last Updated: Oct 09 '12 at 05:01 PM