aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown
diff options
context:
space:
mode:
Diffstat (limited to 'docs/markdown')
-rw-r--r--docs/markdown/Subprojects.md3
-rw-r--r--docs/markdown/snippets/subprojects_update.md8
2 files changed, 10 insertions, 1 deletions
diff --git a/docs/markdown/Subprojects.md b/docs/markdown/Subprojects.md
index 3fbfd5b..7cb04e0 100644
--- a/docs/markdown/Subprojects.md
+++ b/docs/markdown/Subprojects.md
@@ -310,7 +310,8 @@ To pull latest version of all your subprojects at once, just run the command:
- If the wrap file comes from wrapdb, the latest version of the wrap file will
be pulled and used next time meson reconfigure the project. This can be
triggered using `meson --reconfigure`. Previous source tree is not deleted, to
- prevent from any loss of local changes.
+ prevent from any loss of local changes. *Since 0.58.0* If `--reset` is
+ specified, the source tree is deleted and new source is extracted.
- If subproject is currently in detached mode, a checkout of the revision from
wrap file is performed. *Since 0.56.0* a rebase is also performed in case the
revision already existed locally but was outdated. If `--reset` is specified,
diff --git a/docs/markdown/snippets/subprojects_update.md b/docs/markdown/snippets/subprojects_update.md
new file mode 100644
index 0000000..d576bc8
--- /dev/null
+++ b/docs/markdown/snippets/subprojects_update.md
@@ -0,0 +1,8 @@
+## `meson subprojects update --reset` now re-extract tarballs
+
+When using `--reset` option, the source tree of `[wrap-file]` subprojects is now
+deleted and re-extracted from cached tarballs, or re-downloaded. This is because
+Meson has no way to know if the source tree or the wrap file has been modified,
+and `--reset` should guarantee that latest code is being used on next reconfigure.
+
+Use `--reset` with caution if you do local changes on non-git subprojects.