diff --git a/content/en/docs/refguide/modeling/menus/version-control-menu/history-dialog.md b/content/en/docs/refguide/modeling/menus/version-control-menu/history-dialog.md index 4cef5107b54..2fb99da9a4e 100644 --- a/content/en/docs/refguide/modeling/menus/version-control-menu/history-dialog.md +++ b/content/en/docs/refguide/modeling/menus/version-control-menu/history-dialog.md @@ -44,11 +44,17 @@ By selecting a revision in this grid, the tabs below the grid will be filled wit ### Comparing Revisions -To compare any revision to your current working state, right-click a revision and select **Compare to current state**. This opens the [Comparison pane](/refguide/comparison-pane/), which shows all differences between the selected revision and your current state, including uncommitted changes. +Revisions can be compared in the following ways: -{{< figure src="/attachments/refguide/modeling/menus/view-menu/comparison-pane/history-right-click-menu.png" alt="Right-click menu showing Compare to current state option" class="no-border" >}} +* To compare a revision to your current working state, right-click a revision and select **Compare to current state**. This opens the [Comparison pane](/refguide/comparison-pane/), which shows all differences between the selected revision and your current state, including uncommitted changes. -For more information, see [Comparing Revisions](/refguide/comparing-revisions/). +* To compare any two commits, do the following: + * Select the first commit, hold Ctrl (Windows/Linux) or Cmd (Mac) and then select the second commit. + * When two commits are selected, open the **Compare** dropdown and select **Compare revisions (2/2 selected)**, or right-click a selected row, point to **Compare...**, and select **Compare revisions (2/2 selected)**. This opens the [Comparison pane](/refguide/comparison-pane/). These options are unavailable until exactly two commits are selected. + +{{< figure src="/attachments/refguide/modeling/menus/view-menu/comparison-pane/history-right-click-menu.png" alt="Right-click menu showing Compare options" class="no-border" >}} + +For more information, see [Comparison Pane](/refguide/comparison-pane/). #### Revision{#revision} diff --git a/content/en/docs/refguide/modeling/menus/view-menu/comparison-pane.md b/content/en/docs/refguide/modeling/menus/view-menu/comparison-pane.md index f4d8eaf96cb..00b62303ab3 100644 --- a/content/en/docs/refguide/modeling/menus/view-menu/comparison-pane.md +++ b/content/en/docs/refguide/modeling/menus/view-menu/comparison-pane.md @@ -7,20 +7,18 @@ description: "Describes the Comparison Pane in Mendix Studio Pro for comparing a ## Introduction -The **Comparison** pane shows the differences between a selected historical revision and your current working state in a version-controlled app. This pane displays three levels of detail: which documents have changed, which elements within those documents have been altered, and which property values now differ. +The **Comparison** pane shows the differences between revisions in a version-controlled app. You can compare a selected historical revision to your current working state, or compare any two selected commits. This pane displays three levels of detail: which documents have changed, which elements within those documents have been altered, and which property values now differ. This feature requires a version-controlled app. For apps without version control, the **Comparison** pane is disabled. -{{% alert color="warning" %}} -You can only compare a selected historical revision to your current working state. It is not possible to compare two past revisions to each other. -{{% /alert %}} - This feature is similar to the [Changes pane](/refguide/changes-pane/), but while the **Changes** pane shows your local modifications since your last commit, the **Comparison** pane shows differences between any historical revision and your current state. For more information on comparing scenarios, refer to [Comparing Revisions](/refguide/comparing-revisions/). ## Accessing the Comparison Pane and Version Compatibility +You can start a comparison in the following ways: + To compare a revision to your current state, do the following: 1. Open the **History** pane by clicking **View** > **History**. @@ -29,11 +27,16 @@ To compare a revision to your current state, do the following: The **Comparison** pane opens and shows all differences between the selected revision and your current working state, including any uncommitted changes. -{{< figure src="/attachments/refguide/modeling/menus/view-menu/comparison-pane/history-right-click-menu.png" alt="Compare to current state option in History pane right-click menu" class="no-border" >}} +To compare any two commits, do the following: + +1. Open the **History** pane by clicking **View** > **History**. +2. Select the first commit in the list. +3. Hold Ctrl (Windows/Linux) or Cmd (Mac), and select the second commit. +4. Open the **Compare** dropdown and select **Compare revisions (2/2 selected)**, or right-click a selected row, point to **Compare...**, and select **Compare revisions (2/2 selected)**. + +The **Comparison** pane opens and shows all differences between the two selected commits. The compare options are unavailable until exactly two commits are selected. -{{% alert color="warning" %}} -When comparing revisions created in older versions of Studio Pro, the models are automatically converted to the current Studio Pro version format. Due to this automatic conversion, the displayed older revision may not be 100% identical to the original model. This is a normal part of the version upgrade process and does not affect your actual stored revisions. -{{% /alert %}} +{{< figure src="/attachments/refguide/modeling/menus/view-menu/comparison-pane/history-right-click-menu.png" alt="Compare options in History pane right-click menu" class="no-border" >}} ## Comparison Pane Overview diff --git a/content/en/docs/refguide/version-control/using-version-control-in-studio-pro/comparing-revisions.md b/content/en/docs/refguide/version-control/using-version-control-in-studio-pro/comparing-revisions.md index 879fc5c56a1..fecf6701708 100644 --- a/content/en/docs/refguide/version-control/using-version-control-in-studio-pro/comparing-revisions.md +++ b/content/en/docs/refguide/version-control/using-version-control-in-studio-pro/comparing-revisions.md @@ -2,23 +2,19 @@ title: "Comparing Revisions" url: /refguide/comparing-revisions/ weight: 65 -description: "How to compare a historical revision to your current state to understand what changed." +description: "How to compare a historical revision to your current state or compare any two commits to understand what changed." --- ## Introduction -You can compare any historical revision of your version-controlled app to your current working state using the [Comparison pane](/refguide/comparison-pane/). This helps you understand what has changed since a specific commit, see the impact of your recent edits, or review what is affected if you revert to a past revision. +You can compare revisions in your version-controlled app using the [Comparison pane](/refguide/comparison-pane/). You can compare a historical revision to your current working state, or compare any two selected commits. This helps you understand what has changed since a specific commit, see the impact of your recent edits, or review differences between two commits. The comparison shows differences between: -* **Older revision** – the historical revision you selected from the **History** pane -* **Newer revision** – your current working state, including all uncommitted changes +* **Older revision** – the historical revision you selected or the first selected commit when comparing commits +* **Newer revision** – your current working state (for **Compare to current state**) or the second selected commit (for **Compare revisions (2/2 selected)**) -The comparison always includes your current uncommitted changes, so you can use this feature to see how your recent edits differ from any point in your app's history. - -{{% alert color="warning" %}} -You can only compare a selected historical revision to your current working state. It is not possible to compare two arbitrary past revisions to each other. -{{% /alert %}} +When you compare to your current state, the comparison includes your uncommitted changes. For more information on the **Comparison** pane and its detailed overview, refer to [Comparison Pane](/refguide/comparison-pane/). diff --git a/static/attachments/refguide/modeling/menus/view-menu/comparison-pane/history-right-click-menu.png b/static/attachments/refguide/modeling/menus/view-menu/comparison-pane/history-right-click-menu.png index f56980bff58..b95ddb1057f 100644 Binary files a/static/attachments/refguide/modeling/menus/view-menu/comparison-pane/history-right-click-menu.png and b/static/attachments/refguide/modeling/menus/view-menu/comparison-pane/history-right-click-menu.png differ