Skip to content

Latest commit

 

History

History
265 lines (249 loc) · 7.22 KB

README-FOLDER-CHANGES.md

File metadata and controls

265 lines (249 loc) · 7.22 KB
Raw

Changes introduced by the new structure

  • The packages were moved from root to Packages/.
  • The testing packages were moved from root to Tests/SRPTests/Packages
  • The test projects were moved from root to Tests/SRPTests/Projects except PostProcessing_Tests which stayed in the TestProjects/ folder.

Not all folders listed below are part of every release branch, ie, some folders might not be in your branch.

Old Path New Path
com.unity.render-pipelines.core Packages/com.unity.render-pipelines.core
com.unity.render-pipelines.high-definition-config Packages/com.unity.render-pipelines.high-definition-config
com.unity.render-pipelines.high-definition Packages/com.unity.render-pipelines.high-definition
com.unity.render-pipelines.universal Packages/com.unity.render-pipelines.universal
com.unity.shaderanalysis Packages/com.unity.shaderanalysis
com.unity.shadergraph Packages/com.unity.shadergraph
com.unity.visualeffectgraph Packages/com.unity.visualeffectgraph
com.unity.testing.graphics-performance Tests/SRPTests/Packages/com.unity.testing.graphics-performance
com.unity.testing.hdrp Tests/SRPTests/Packages/com.unity.testing.hdrp
com.unity.testing.urp-upgrade Tests/SRPTests/Packages/com.unity.testing.urp-upgrade
com.unity.testing.urp Tests/SRPTests/Packages/com.unity.testing.urp
com.unity.testing.visualeffectgraph Tests/SRPTests/Packages/com.unity.testing.visualeffectgraph
com.unity.testing.xr Tests/SRPTests/Packages/com.unity.testing.xr
[master+2022.1/staging] TestProjects/BatchRendererGroup_HDRP Tests/SRPTests/Projects/BatchRendererGroup_HDRP
[master+2022.1/staging] TestProjects/BatchRendererGroup_URP Tests/SRPTests/Projects/BatchRendererGroup_URP
TestProjects/BuiltInGraphicsTest_Foundation Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation
TestProjects/BuiltInGraphicsTest_Lighting Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting
TestProjects/HDRP_DXR_Tests Tests/SRPTests/Projects/HDRP_DXR_Tests
TestProjects/HDRP_PerformanceTests Tests/SRPTests/Projects/HDRP_PerformanceTests
TestProjects/HDRP_RuntimeTests Tests/SRPTests/Projects/HDRP_RuntimeTests
TestProjects/HDRP_Tests Tests/SRPTests/Projects/HDRP_Tests
TestProjects/Lightmapping Tests/SRPTests/Projects/Lightmapping
TestProjects/SRP_SmokeTest Tests/SRPTests/Projects/SRP_SmokeTest
TestProjects/ShaderGraph Tests/SRPTests/Projects/ShaderGraph
TestProjects/ShaderGraphUniversalStereo Tests/SRPTests/Projects/ShaderGraphUniversalStereo
TestProjects/UniversalGfxTestStereo Tests/SRPTests/Projects/UniversalGfxTestStereo
TestProjects/UniversalGraphicsTest_2D Tests/SRPTests/Projects/UniversalGraphicsTest_2D
TestProjects/UniversalGraphicsTest_Foundation Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation
TestProjects/UniversalGraphicsTest_Lighting Tests/SRPTests/Projects/UniversalGraphicsTest_Lighting
TestProjects/UniversalGraphicsTest_PostPro Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro
TestProjects/UniversalGraphicsTest_Terrain Tests/SRPTests/Projects/UniversalGraphicsTest_Terrain
TestProjects/UniversalUpgradeTest Tests/SRPTests/Projects/UniversalUpgradeTest
TestProjects/VisualEffectGraph_HDRP Tests/SRPTests/Projects/VisualEffectGraph_HDRP
TestProjects/VisualEffectGraph_URP Tests/SRPTests/Projects/VisualEffectGraph_URP
[2021.3/staging] TestProjects/HDRP_HybridTests Tests/SRPTests/Projects/HDRP_HybridTests
[2021.3/staging] TestProjects/UniversalHybridTest Tests/SRPTests/Projects/UniversalHybridTest

Guidelines to merge with your custom changes

Breaking down the merges into 2 steps makes it more manageable:

  1. First merge :
  2. Then merge the actual restructured mainline

In case you want to merge <branch> into <mainline>, it’s safer to first merge <mainline> into <branch> than the other way around. (https://stackoverflow.com/a/57313561/5804755). Side effect: you now have <mainline> into <branch>.

Solution

  1. git checkout <branch>

  2. git merge <last mainline commit before the restructure> // deal with "regular" Merge Conflicts

  3. Manually restructure the repo as was done on the mainline (described above). This can be done via the file explorer or if you feel more adventurous, via script (your mileage may vary depending on your OS - it may just be easier to do it by hand)

  4. git add .

  5. git commit -m "Apply new structure"

  6. git merge -s ours <mainline>

  7. // If you want to merge into the mainline

    git checkout <mainline>
git merge <branch>