diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-10-08 10:09:15 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-10-13 11:12:49 +0000 |
| commit | 3ade5bbd92b506f215f86a7d41048b22b287c673 (patch) | |
| tree | 2719b23d8221faddfbcad0cf6cc6433dec298d5d /docs/markdown/snippets | |
| parent | 47046c3fb988c656a04521df932900dc47f0f6db (diff) | |
| download | meson-3ade5bbd92b506f215f86a7d41048b22b287c673.zip meson-3ade5bbd92b506f215f86a7d41048b22b287c673.tar.gz meson-3ade5bbd92b506f215f86a7d41048b22b287c673.tar.bz2 | |
msubprojects: Handle change of URL in wrap-git
Diffstat (limited to 'docs/markdown/snippets')
| -rw-r--r-- | docs/markdown/snippets/subprojects_update.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/markdown/snippets/subprojects_update.md b/docs/markdown/snippets/subprojects_update.md index 022545e..f85a9eb 100644 --- a/docs/markdown/snippets/subprojects_update.md +++ b/docs/markdown/snippets/subprojects_update.md @@ -17,12 +17,15 @@ If the command fails on any subproject the execution continues with other subprojects, but at the end an error code is now returned. The `update` subcommand has been reworked: +- In the case the URL of `origin` is different as the `url` set in wrap file, + the subproject will not be updated unless `--reset` is specified (see below). - The `--rebase` behaviour is now the default for consistency: it was already rebasing when current branch and revision are the same, it is less confusing to rebase when they are different too. - Add `--reset` mode that checkout the new branch and hard reset that branch to remote commit. This new mode guarantees that every - subproject are exactly at the wrap's revision. + subproject are exactly at the wrap's revision. In addition the URL of `origin` + is updated in case it changed in the wrap file. - Local changes are always stashed first to avoid any data loss. In the worst case scenario the user can always check reflog and stash list to rollback. |