You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: content/en/docs/refguide/modeling/menus/version-control-menu/history-dialog.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -43,9 +43,9 @@ By selecting a revision in this grid, the tabs below the grid will be filled wit
43
43
44
44
### Comparing Revisions
45
45
46
-
You can compare any revision to your current working state by right-clicking a revision and selecting **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.
46
+
You can compare any revision to your current working state by right-clicking a revision and selecting **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
47
48
-
{{< figure src="/attachments/refguide/modeling/menus/view-menu/comparison-pane/history-right-click-menu.png" alt="Compare to current state in History pane right-click menu" class="no-border" >}}
48
+
{{< figure src="/attachments/refguide/modeling/menus/view-menu/comparison-pane/history-right-click-menu.png" alt="Compare to current state in History dialog right-click menu" class="no-border" >}}
49
49
50
50
For more information, see [Comparing Revisions](/refguide/comparing-revisions/).
Copy file name to clipboardExpand all lines: content/en/docs/refguide/modeling/menus/view-menu/comparison-pane.md
+16-22Lines changed: 16 additions & 22 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -12,10 +12,12 @@ The **Comparison** pane shows the differences between a selected historical revi
12
12
This feature requires a version-controlled app. For apps without version control, the **Comparison** pane is disabled.
13
13
14
14
{{% alert color="warning" %}}
15
-
The key limitation of the **Comparison** pane is that 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.
15
+
The key limitation of the **Comparison** pane is that 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
16
{{% /alert %}}
17
17
18
-
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.
18
+
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.
19
+
20
+
For more information on comparing scenarios, see [Comparing Revisions](/refguide/comparing-revisions/).
19
21
20
22
## Accessing the Comparison Pane and Version Compatibility
21
23
@@ -25,10 +27,10 @@ To compare a revision to your current state, do the following:
25
27
2. Choose a revision from the list by right-clicking it.
26
28
3. Select **Compare to current state**.
27
29
28
-
{{< 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" >}}
29
-
30
30
The **Comparison** pane opens and shows all differences between the selected revision and your current working state, including any uncommitted changes.
31
31
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" >}}
33
+
32
34
{{% alert color="warning" %}}
33
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.
34
36
{{% /alert %}}
@@ -37,9 +39,9 @@ When comparing revisions created in older versions of Studio Pro, the models are
37
39
38
40
The **Comparison** pane shows information at three levels:
39
41
40
-
***Level 1** – A list of all documents that differ between the two revisions
41
-
***Level 2** – All elements within a selected document that have changed
42
-
***Level 3** – The specific property values that differ for a selected element
42
+
***Level 1** – A list of all documents that differ between the two revisions.
43
+
***Level 2** – All elements within a selected document that have changed.
44
+
***Level 3** – The specific property values that differ for a selected element.
43
45
44
46
You can navigate between levels by double-clicking a row or using the **Go to** button. Press <kbd>Backspace</kbd> or click **Back** to return to the previous level.
45
47
@@ -71,14 +73,12 @@ Right-click any cell in the grid to access the **Copy** option, which copies the
71
73
72
74
The document list grid contains the following columns:
73
75
74
-
| Column | Description |What It Shows |
76
+
| Column | Description |Elements It Shows |
75
77
|--------|-------------|---------------|
76
-
|**Status**| The type of change | An icon and label indicating whether the document was Added, Modified, or Deleted |
77
-
|**Item**| The document name | The name of the changed document (for example, a page, microflow, or domain model) |
78
+
|**Status**| The type of change | An icon and label indicating whether the document was **Added**, **Modified**, or **Deleted**|
79
+
|**Item**| The document name | The name of the changed document (for example, a page, a microflow, or a domain model) |
78
80
|**Module**| The module location | The module that contains the document |
79
81
80
-
All columns are sortable by clicking the column header. Column widths can be adjusted by dragging the column divider. Hover over any cell to see the full value in a tooltip.
81
-
82
82
#### Status Types
83
83
84
84
The **Status** column shows one of the following types:
@@ -89,15 +89,13 @@ The **Status** column shows one of the following types:
89
89
|**Modified**| Yellow circle | Changes were made to an existing document | The document exists in both revisions but has differences |
90
90
|**Deleted**| Red circle with minus | A document was removed | The document existed in the selected revision but not in the current state |
91
91
92
-
The icon and text spacing is consistent with the History Pane style.
93
-
94
92
## Level 2 and 3: Element and Property Differences
95
93
96
94
Double-clicking a document in Level 1 navigates to Level 2 and Level 3, which appear side by side. Level 2 shows changed elements, and Level 3 shows the property differences for the selected element.
97
95
98
96
{{< figure src="/attachments/refguide/modeling/menus/view-menu/comparison-pane/comparison-pane-level2-3.png" alt="Comparison Pane Level 2 and Level 3 showing element and property differences" class="no-border" >}}
99
97
100
-
####Task Bar
98
+
### Task Bar
101
99
102
100
The task bar at Level 2 and 3 contains the following buttons:
103
101
@@ -109,11 +107,11 @@ The task bar at Level 2 and 3 contains the following buttons:
109
107
|**Collapse all**| Collapses all expanded property tree rows in Level 3 | Always enabled when viewing Level 3 |
110
108
|**Stop comparison**| Closes the comparison and returns to the blank state | Always enabled during an active comparison |
111
109
112
-
####Context Menu
110
+
### Context Menu
113
111
114
112
Right-click any cell in either the Level 2 or Level 3 grid to access the **Copy** option.
115
113
116
-
####Level 2 Grid
114
+
### Level 2 Grid
117
115
118
116
The Level 2 grid shows all changed elements within the selected document:
119
117
@@ -124,7 +122,7 @@ The Level 2 grid shows all changed elements within the selected document:
124
122
125
123
Hover over any cell to see the full value in a tooltip.
126
124
127
-
####Level 3 Grid
125
+
### Level 3 Grid
128
126
129
127
The Level 3 grid shows the property-level differences for the element selected in Level 2:
130
128
@@ -136,10 +134,6 @@ The Level 3 grid shows the property-level differences for the element selected i
136
134
137
135
Property paths are consolidated into a tree view. Grey rows represent intermediate path levels that do not have a direct value. The row order reflects the top-to-bottom, left-to-right order that the corresponding components appear in their dialog boxes.
138
136
139
-
#### Splitter
140
-
141
-
A draggable splitter separates Level 2 and Level 3. Drag the splitter to adjust the space allocated to each level. By default, Level 3 (property differences) is given more space than Level 2 (element list).
142
-
143
137
## Opening Documents
144
138
145
139
When you click **Go to** or double-click a document entry in Level 1, the document opens as it currently exists in your app. If the document no longer exists in your current state, Level 2 and 3 is shown but nothing opens in the editor.
Copy file name to clipboardExpand all lines: content/en/docs/refguide/version-control/_index.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -33,7 +33,7 @@ Currently, Mendix does not support pull or merge requests through the Team Serve
33
33
34
34
## Comparing Revisions
35
35
36
-
Use the [Comparison Pane](/refguide/comparison-pane/) to compare any historical revision to your current working state. This helps you understand what has changed since a specific revision, see the impact of your recent edits, or review what would be affected if you reverted to a past revision.
36
+
Use the [Comparison pane](/refguide/comparison-pane/) to compare any historical revision to your current working state. This helps you understand what has changed since a specific revision, see the impact of your recent edits, or review what would be affected if you reverted to a past revision.
37
37
38
38
For more information, see [Comparing Revisions](/refguide/comparing-revisions/).
Copy file name to clipboardExpand all lines: content/en/docs/refguide/version-control/using-version-control-in-studio-pro/comparing-revisions.md
+2-4Lines changed: 2 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,16 +1,14 @@
1
1
---
2
2
title: "Comparing Revisions"
3
3
url: /refguide/comparing-revisions/
4
-
weight: 25
4
+
weight: 65
5
5
description: "How to compare a historical revision to your current state to understand what changed."
6
6
---
7
7
8
8
## Introduction
9
9
10
10
You can compare any historical revision of your version-controlled app to your current working state via the **Comparison** pane. It can help you understand what has changed since a specific commit, see the impact of your recent edits, or review what is affected if you reverted to a past revision.
11
11
12
-
The comparison shows three levels of detail: which documents changed, which elements within those documents changed, and which property values differ between the revision and your current state.
13
-
14
12
The comparison shows differences between:
15
13
16
14
***Older revision** – The historical revision you selected from the **History** pane
@@ -34,7 +32,7 @@ You can review all changes made since a specific commit, which helps you underst
34
32
35
33
Before reverting to an older revision, you can compare your current changes to a revision you are considering reverting to and review what changes will be lost. This helps you make an informed decision about whether reverting is safe or if it would undo important work.
36
34
37
-
### Did My Recent Changes Affect This Area?
35
+
### Will My Recent Changes Affect a Specific Area?
38
36
39
37
To check if your recent uncommitted changes affected a specific area of your app:
0 commit comments