Skip to content

Commit 7708210

Browse files
Smaller changes and remove personal data
1 parent bc793d4 commit 7708210

5 files changed

Lines changed: 21 additions & 29 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ By selecting a revision in this grid, the tabs below the grid will be filled wit
4343

4444
### Comparing Revisions
4545

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.
4747

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" >}}
4949

5050
For more information, see [Comparing Revisions](/refguide/comparing-revisions/).
5151

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

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ The **Comparison** pane shows the differences between a selected historical revi
1212
This feature requires a version-controlled app. For apps without version control, the **Comparison** pane is disabled.
1313

1414
{{% 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.
1616
{{% /alert %}}
1717

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/).
1921

2022
## Accessing the Comparison Pane and Version Compatibility
2123

@@ -25,10 +27,10 @@ To compare a revision to your current state, do the following:
2527
2. Choose a revision from the list by right-clicking it.
2628
3. Select **Compare to current state**.
2729

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-
3030
The **Comparison** pane opens and shows all differences between the selected revision and your current working state, including any uncommitted changes.
3131

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+
3234
{{% alert color="warning" %}}
3335
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.
3436
{{% /alert %}}
@@ -37,9 +39,9 @@ When comparing revisions created in older versions of Studio Pro, the models are
3739

3840
The **Comparison** pane shows information at three levels:
3941

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.
4345

4446
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.
4547

@@ -71,14 +73,12 @@ Right-click any cell in the grid to access the **Copy** option, which copies the
7173

7274
The document list grid contains the following columns:
7375

74-
| Column | Description | What It Shows |
76+
| Column | Description | Elements It Shows |
7577
|--------|-------------|---------------|
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) |
7880
| **Module** | The module location | The module that contains the document |
7981

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-
8282
#### Status Types
8383

8484
The **Status** column shows one of the following types:
@@ -89,15 +89,13 @@ The **Status** column shows one of the following types:
8989
| **Modified** | Yellow circle | Changes were made to an existing document | The document exists in both revisions but has differences |
9090
| **Deleted** | Red circle with minus | A document was removed | The document existed in the selected revision but not in the current state |
9191

92-
The icon and text spacing is consistent with the History Pane style.
93-
9492
## Level 2 and 3: Element and Property Differences
9593

9694
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.
9795

9896
{{< 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" >}}
9997

100-
#### Task Bar
98+
### Task Bar
10199

102100
The task bar at Level 2 and 3 contains the following buttons:
103101

@@ -109,11 +107,11 @@ The task bar at Level 2 and 3 contains the following buttons:
109107
| **Collapse all** | Collapses all expanded property tree rows in Level 3 | Always enabled when viewing Level 3 |
110108
| **Stop comparison** | Closes the comparison and returns to the blank state | Always enabled during an active comparison |
111109

112-
#### Context Menu
110+
### Context Menu
113111

114112
Right-click any cell in either the Level 2 or Level 3 grid to access the **Copy** option.
115113

116-
#### Level 2 Grid
114+
### Level 2 Grid
117115

118116
The Level 2 grid shows all changed elements within the selected document:
119117

@@ -124,7 +122,7 @@ The Level 2 grid shows all changed elements within the selected document:
124122

125123
Hover over any cell to see the full value in a tooltip.
126124

127-
#### Level 3 Grid
125+
### Level 3 Grid
128126

129127
The Level 3 grid shows the property-level differences for the element selected in Level 2:
130128

@@ -136,10 +134,6 @@ The Level 3 grid shows the property-level differences for the element selected i
136134

137135
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.
138136

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-
143137
## Opening Documents
144138

145139
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.

content/en/docs/refguide/version-control/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Currently, Mendix does not support pull or merge requests through the Team Serve
3333

3434
## Comparing Revisions
3535

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.
3737

3838
For more information, see [Comparing Revisions](/refguide/comparing-revisions/).
3939

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
---
22
title: "Comparing Revisions"
33
url: /refguide/comparing-revisions/
4-
weight: 25
4+
weight: 65
55
description: "How to compare a historical revision to your current state to understand what changed."
66
---
77

88
## Introduction
99

1010
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.
1111

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-
1412
The comparison shows differences between:
1513

1614
* **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
3432

3533
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.
3634

37-
### Did My Recent Changes Affect This Area?
35+
### Will My Recent Changes Affect a Specific Area?
3836

3937
To check if your recent uncommitted changes affected a specific area of your app:
4038

-8.72 KB
Loading

0 commit comments

Comments
 (0)