Merge pull request #1573 from IETS3/merge/mps20241

Merge maintenance/mps20241 into maintenance/mps20251

Author: kbirken

CHANGELOG.md

@@ -10,6 +10,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 ### Added
 
 - Variability: The intention "Update all configurations" for feature models has been improved: Now a modal dialog with a progress bar and some additional information is shown. The process is now completely sequential, improving stability. Moreover, there is some timing output in the log. Finally, performance has been improved by postponing the event handling for all changes to the involved models.
+- Variability: The intention "Adapt to changes in feature model" and related quickfixes also have been improved similarly to the improvements on "Update all configurations".
 
 ### Fixed
 
@@ -19,6 +20,8 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 - Variability: Remove deprecated concepts `VariabilityModelChunk_old`, and some related concepts.
 - Typesystem: All usages of colon casts were transformed to the 'as' cast for null safety. From now on no colon casts are allowed in the typesystem, also read this issue for more info: https://github.com/IETS3/iets3.opensource/issues/688
+- Variability: The grouping of root constraints has been improved. New root constraints will be added next to the other constraints in the respective groups. This helps to avoid merge conflicts.
+
 
 ## November 2025
 

code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.behavior.mps

@@ -2447,19 +2447,19 @@
         <node concept="3SKdUt" id="BUsxZFHBLu" role="3cqZAp">
           <node concept="1PaTwC" id="BUsxZFHBLv" role="1aUNEU">
             <node concept="3oM_SD" id="BUsxZFHBLw" role="1PaTwD">
-              <property role="3oM_SC" value="ToDo:" />
+              <property role="3oM_SC" value="TODO:" />
             </node>
             <node concept="3oM_SD" id="BUsxZFHBLx" role="1PaTwD">
-              <property role="3oM_SC" value="if" />
+              <property role="3oM_SC" value="If" />
             </node>
             <node concept="3oM_SD" id="BUsxZFHBLy" role="1PaTwD">
               <property role="3oM_SC" value="we" />
             </node>
             <node concept="3oM_SD" id="BUsxZFHBLz" role="1PaTwD">
-              <property role="3oM_SC" value="don" />
+              <property role="3oM_SC" value="do" />
             </node>
-            <node concept="3oM_SD" id="BUsxZFHBL$" role="1PaTwD">
-              <property role="3oM_SC" value="ot" />
+            <node concept="3oM_SD" id="5BtXES5KjV8" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
             </node>
             <node concept="3oM_SD" id="BUsxZFHBL_" role="1PaTwD">
               <property role="3oM_SC" value="want" />
@@ -2535,6 +2535,55 @@
             </node>
           </node>
         </node>
+        <node concept="3SKdUt" id="6NYeeIyd12k" role="3cqZAp">
+          <node concept="1PaTwC" id="6NYeeIyd12l" role="1aUNEU">
+            <node concept="3oM_SD" id="6NYeeIyd12m" role="1PaTwD">
+              <property role="3oM_SC" value="TODO2:" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd2ch" role="1PaTwD">
+              <property role="3oM_SC" value="This" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd2y7" role="1PaTwD">
+              <property role="3oM_SC" value="should" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd2y8" role="1PaTwD">
+              <property role="3oM_SC" value="probably" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd2y9" role="1PaTwD">
+              <property role="3oM_SC" value="replaced" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd3dM" role="1PaTwD">
+              <property role="3oM_SC" value="by" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd3dN" role="1PaTwD">
+              <property role="3oM_SC" value="using" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd5Gz" role="1PaTwD">
+              <property role="3oM_SC" value="UpdateOneConfigTask" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd5GO" role="1PaTwD">
+              <property role="3oM_SC" value="as" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd5H5" role="1PaTwD">
+              <property role="3oM_SC" value="done" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd62U" role="1PaTwD">
+              <property role="3oM_SC" value="in" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd6oJ" role="1PaTwD">
+              <property role="3oM_SC" value="other" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd7HB" role="1PaTwD">
+              <property role="3oM_SC" value="intentions" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd7HC" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="6NYeeIyd95d" role="1PaTwD">
+              <property role="3oM_SC" value="quickfixes." />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="BUsxZFHBLX" role="3cqZAp">
           <node concept="2YIFZM" id="50qksmEcuBs" role="3clFbG">
             <ref role="37wK5l" to="lte6:5cx1lEoFsLr" resolve="propagateFeatureModelChangesToConfigAsync" />