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
- var VisionOSEDRHeadromm has a comma instead of a dot when building with Metal Rendering App Mode and local OS localization is set to German
- IAP Catalog remove product “x” and add product “+” buttons are not consistent with other remove and add buttons in the Editor
- Performance issues in Play Mode when quickly hovering the mouse cursor over Hierarchy GameObjects
- Frame Debugger displays incorrect output when FidelityFX Super Resolution or Spatial-Temporal Upscaler is used with Temporal Anti-aliasing or Subpixel Morphological Anti-aliasing
- The layout system is failing to correctly calculate or apply the height of the Japanese fallback font when the primary English font's metrics are used
Add comment