Skip to content

Commit 487ed29

Browse files
Merge pull request mendix#9253 from tknippenberg/MPRv2Default
Marked MPRv2 as GA
2 parents b343bda + 9ee1dec commit 487ed29

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

  • content/en/docs/refguide/version-control/version-control-troubleshooting

content/en/docs/refguide/version-control/version-control-troubleshooting/repository-size.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ Version control systems like Git do not store a full copy of a document for ever
4242

4343
#### MPRv2 Format {#mprv2}
4444

45-
Studio Pro 10.18 introduced a public beta of the new version of the *.mpr* format: MPRv2. The key difference is that all documents, such as microflows, are no longer stored as part of the *.mpr* file but as separate files in the *mprcontents* directory. The *.mpr* file functions as an index file pointing to all the different files on disk.
45+
{{% alert color="info" %}}
46+
MPRv2 was released in Studio Pro 10.18.0 as [Public Beta](/releasenotes/beta-features/). In Studio Pro 10.21.0, MPRv2 was released for General Availability (GA) and is automatically used for new apps.
47+
{{% /alert %}}
48+
49+
Studio Pro 10.18 introduced a new version of the *.mpr* format: MPRv2. The key difference is that all documents, such as microflows, are no longer stored as part of the *.mpr* file but as separate files in the *mprcontents* directory. The *.mpr* file functions as an index file pointing to all the different files on disk.
4650

4751
This means that when you change one document, for example, a page, only a small file representing that page will change on disk. This allows Git to calculate an efficient delta and results in a more appropriate repository growth compared to MPRv1. Functionally there is no differences between the split (v2) or the combined (v1) format inside Studio Pro.
4852

@@ -51,7 +55,7 @@ Collaborating within one app on MPRv1 and MPRv2 branches is possible. To limit r
5155
{{% /alert %}}
5256

5357
{{% alert color="warning" %}}
54-
Merging using the command line with `git merge` or by using third-party tools is not yet supported for MPRv2.
58+
Merging MPRv2 apps using the command line with `git merge` or using third-party tools is only supported from Studio Pro 10.21.0 and above. Hybrid merges involving both MPRv1 and MPRv2 formats are not supported.
5559
{{% /alert %}}
5660

5761
#### Converting MPR Storage Format {#convert}
@@ -231,5 +235,5 @@ In case you are still deciding whether to migrate from SVN to Git, or you are al
231235

232236
{{< figure src="/attachments/refguide/version-control/troubleshoot-version-control-issues/migration-advice-combined.png" class="no-border" >}}
233237

234-
MPRv2 is in beta in Studio Pro 10.18 and above and you can manually convert branches. When this feature is GA, branch conversion will happen automatically. For more information on the format, see the [MPRv2 Format](#mprv2) section.
238+
In Studio Pro 10.18 and above, you can manually convert branches to MPRv2. In future versions, branch conversion will happen automatically. For more information on the format, see the [MPRv2 Format](#mprv2) section.
235239
For more information on partial clone, see [Clone Type](/refguide/clone-type/).

0 commit comments

Comments
 (0)