Search Issue Tracker
Fixed
Votes
0
Found in
4.2.0b1
Issue ID
541050
Regression
No
Commit simple changes to scene file doesn't work if file was changed by someone else
- Create a project with an empty scene and host it on SVN
- Open the project in Unity on two different machines
- On one machine add some primitives to the scene, save the scene and submit the changes
- On the other machine make other changes to the scene and save it
- Go to the default outgoing changeset and select Submit
- Try to submit the changed scene file
Expected: there are conflicts with the other scene file, but they can be solved and the scenes merged
Actual: Version Control General: Failed to start process '"C:\Program Files\TortoiseSVN\bin\svn.exe" commit --depth=empty -F E:/localSvnTest/project/Temp/svncommitmessage.txt "E:/localSvnTest/project/Assets" "E:/localSvnTest/project/Assets/Scene.unity"' exit code 1) - because file was out of date
All about bugs
View bugs we have successfully reproduced, and vote for the bugs you want to see fixed most urgently.
Latest issues
- Game view renders artifacts when Camera's Component "Post Anti-aliasing" is set to "TAA" and Dynamic Resolution's "Forced Screen Percentage" is changed
- A deactivated Prefab's name color becomes white when a GameObject in the scene is deactivated
- The Game view becomes blank when using Frame Debugger with MSAA and Texture binding enabled in Play Mode
- Crash on dynamixel_sdk.dynamixel:groupSyncReadTxRxPacket when entering Play Mode after updating path to Dynamixel SDK in script
- NullReferenceException is thrown when changing the Inspector preview selection
Add comment