From 2d942dbb50131a671ba3a826c8f81e32b3d2f506 Mon Sep 17 00:00:00 2001 From: Cheng Date: Mon, 13 Jun 2022 13:57:43 +1000 Subject: [PATCH] still moving, always one more thing --- docs/libraries.md | 24 ++++++++++++++---------- wxWidgets | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/docs/libraries.md b/docs/libraries.md index 7fde6b1..ffaac06 100644 --- a/docs/libraries.md +++ b/docs/libraries.md @@ -149,7 +149,7 @@ own, which have their own upstreams Update your version with ```bash -git pull upstream --recurse-submodules=on-demand their-latest release. +git pull upstream --recurse-submodules=on-demand «their-latest-release» ``` Make sure things still work. Get everything working. (You do have unit test, right?) @@ -157,20 +157,24 @@ Make sure things still work. Get everything working. (You do have unit test, r then: ```bash -git submodule foreach --recursive 'git push origin HEAD:your-tracking-branch' +git submodule foreach --recursive 'git push origin HEAD:«your-tracking-branch»' git submodule foreach --recursive 'git switch --detach' ``` All of which, of course, presupposes you have already set unit tests, -upstream, origin, and your tracking branch appropriately. +upstream, origin, and your tracking branch appropriately. -Even though your local modifications are nameless in your local -repository, on your remote they need to have a name to be pushed -to, hence you need to have a tracking branch in each of your -remote images of each of your submodules, and that tracking -branch will point to the root of a tree of all the nameless commits -that the names and commits in your superproject that contains all -these submodules point to. +Even if your local modifications are nameless in your local +submodule repository, on your remote submodule repository they +need to have a name to be pushed to, hence you need to have a +tracking branch in each of your remote images of each of your +submodules, and that tracking branch will need to point to the root +of a tree of all the nameless commits that the names and commits +in your superproject that contains this submodules point to. + +You want `.gitmodules` in your local image of the repository to +reflect the location and fork of your new remote repository, with +your remote as its `origin` and their remote as its `upstream`. You need an enormous pile of source code, the work of many people over a very long time, and GitSubmodules allows this to scale, because the diff --git a/wxWidgets b/wxWidgets index 57e4e5d..14c6b43 160000 --- a/wxWidgets +++ b/wxWidgets @@ -1 +1 @@ -Subproject commit 57e4e5d70599a019a7497ce626f58687a6d67605 +Subproject commit 14c6b431626b817bd7564f4ee3480299307533fa