Skip to content

Commit 2939c1b

Browse files
Merge pull request #11494 from BhagyashreeMahajan-mx/ccr-405-any-to-any-revision-comparison
[CCR-405] Any to Any Revison Comparison
2 parents 0db6576 + dbe8ef8 commit 2939c1b

4 files changed

Lines changed: 26 additions & 21 deletions

File tree

content/en/docs/refguide/modeling/menus/version-control-menu/history-dialog.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,17 @@ By selecting a revision in this grid, the tabs below the grid will be filled wit
4444

4545
### Comparing Revisions
4646

47-
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.
47+
Revisions can be compared in the following ways:
4848

49-
{{< 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" >}}
49+
* 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.
5050

51-
For more information, see [Comparing Revisions](/refguide/comparing-revisions/).
51+
* To compare any two commits, do the following:
52+
* Select the first commit, hold <kbd>Ctrl</kbd> (Windows/Linux) or <kbd>Cmd</kbd> (Mac) and then select the second commit.
53+
* 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.
54+
55+
{{< 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" >}}
56+
57+
For more information, see [Comparison Pane](/refguide/comparison-pane/).
5258

5359
#### Revision{#revision}
5460

content/en/docs/refguide/modeling/menus/view-menu/comparison-pane.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,18 @@ description: "Describes the Comparison Pane in Mendix Studio Pro for comparing a
77

88
## Introduction
99

10-
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.
10+
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.
1111

1212
This feature requires a version-controlled app. For apps without version control, the **Comparison** pane is disabled.
1313

14-
{{% alert color="warning" %}}
15-
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.
16-
{{% /alert %}}
17-
1814
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.
1915

2016
For more information on comparing scenarios, refer to [Comparing Revisions](/refguide/comparing-revisions/).
2117

2218
## Accessing the Comparison Pane and Version Compatibility
2319

20+
You can start a comparison in the following ways:
21+
2422
To compare a revision to your current state, do the following:
2523

2624
1. Open the **History** pane by clicking **View** > **History**.
@@ -29,11 +27,16 @@ To compare a revision to your current state, do the following:
2927

3028
The **Comparison** pane opens and shows all differences between the selected revision and your current working state, including any uncommitted changes.
3129

32-
{{< 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" >}}
30+
To compare any two commits, do the following:
31+
32+
1. Open the **History** pane by clicking **View** > **History**.
33+
2. Select the first commit in the list.
34+
3. Hold <kbd>Ctrl</kbd> (Windows/Linux) or <kbd>Cmd</kbd> (Mac), and select the second commit.
35+
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)**.
36+
37+
The **Comparison** pane opens and shows all differences between the two selected commits. The compare options are unavailable until exactly two commits are selected.
3338

34-
{{% alert color="warning" %}}
35-
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.
36-
{{% /alert %}}
39+
{{< 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" >}}
3740

3841
## Comparison Pane Overview
3942

content/en/docs/refguide/version-control/using-version-control-in-studio-pro/comparing-revisions.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,19 @@
22
title: "Comparing Revisions"
33
url: /refguide/comparing-revisions/
44
weight: 65
5-
description: "How to compare a historical revision to your current state to understand what changed."
5+
description: "How to compare a historical revision to your current state or compare any two commits to understand what changed."
66
---
77

88
## Introduction
99

10-
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.
10+
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.
1111

1212
The comparison shows differences between:
1313

14-
* **Older revision** – the historical revision you selected from the **History** pane
15-
* **Newer revision** – your current working state, including all uncommitted changes
14+
* **Older revision** – the historical revision you selected or the first selected commit when comparing commits
15+
* **Newer revision** – your current working state (for **Compare to current state**) or the second selected commit (for **Compare revisions (2/2 selected)**)
1616

17-
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.
18-
19-
{{% alert color="warning" %}}
20-
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.
21-
{{% /alert %}}
17+
When you compare to your current state, the comparison includes your uncommitted changes.
2218

2319
For more information on the **Comparison** pane and its detailed overview, refer to [Comparison Pane](/refguide/comparison-pane/).
2420

215 KB
Loading

0 commit comments

Comments
 (0)