Unity4 asset server source merge broken on Windows (fine on mac)

Issue Tracker
1

this has been a problem for a while. it’s causing major workflow problems for us. I’m surprised nobody has mentioned it here. It’s 100% problem for at least 3 people on our team, so it’s not a fluke.

active bug here, reported in january 2013. no responses.

https://fogbugz.unity3d.com/default.asp?513861_3i55crhupveh8ccs

"this has become 100% repro on every merged cs file. very painful.

the text inserted at top of file is

diff: extra operand
diff: Try diff --help' for more information. diff: extra operand diff: Try diff --help’ for more information.

and it appears to preserve local changes, and toss out incoming changes
from asset server.
"

2

does the silence mean nobody but us is experiencing this, or that nobody uses asset server any more?
It’s a massive workflow breaking problem…

3

im not sure how many people use asset server, but we are thinking about using it since we couldn’t get svn to play nice with unity. So, this is a free bump for you…I hope you can get some answers, since it will help us decide if the asset server is worth it.

4

honestly this is a new problem. we didn’t have a merge issue before unity 4. we’re not sure what happened or how to diagnose it. or if it’s a problem with our internal setup. I wish somebody from Unity would chime in on this one, at least if internally they can reproduce the problem or not…

5

ok i “solved” this but it’s kind of ridiculous
in here:
C:\Program Files (x86)\Unity\Editor\Data\Tools

are diff.exe and diff3.exe
they are v2.7 by default installation
replacing them w/ 2.8 versions of the same open source gnu tools makes it stop misbehaving. not sure how this is getting through unity qa?

6

same here happened about few weeks ago (after windows update?) tried update diff to 2.8 reinstalled windows 7 64bit but didn’t help

7

on computer that its working it writes path to diff.exe without spaces
-a --horizon-lines=10 – C:/Users/Niko/DOCUME~1/NEWUNI~1/Assets/NEWBEH~1.CS C:/Users/Niko/DOCUME~1/NEWUNI~1/Temp/SERVER~1.CS

on computer that its not working it write with spaces
-a --horizon-lines=10 – F:/DOCUME~2/New Unity Project 3/Assets/NewBehaviourScript.cs F:/DOCUME~2/New Unity Project 3/Temp/Server’s version of NewBehaviourScript.cs