Greg,
I think the below steps will do a an atomic tag/branch (Branch protections
may be needed as well)
However, it exemplifies why Submodules are evil but useful. A much simpler
approach is 2 folder is the same project - I am aware of ALL the arguments -
I agree with most of them but there are dependency on nuttx to apps from all
the defconfig files and nsh)
First question I would poll the community is: "How many of you do not use
the apps folder?"
------
NuttX - is the Knot repo.
Apps is a sub module
Nuttx is a sub module
origin is the remote for NuttX, apps and nuttx
cd NuttX
git checkout master
git submodule sync --recursive && git submodule update --init --recursive
git checkout -b master_imx_network_fixes
cd nuttx
git checkout -b master_imx_network_fixes
cd ../apps
git checkout -b master_imx_network_fixes
cd ../nuttx
Do all your changes.
git add ...
git commit ...
git push origin master_imx_network_fixes
cd ../apps
Do all your changes.
git add ...
git commit ...
git push origin master_imx_network_fixes
cd .. (NuttX)
git add apps nuttx
git commit ...
git tag -a nuttx-yada -m "my version 1.4"
git push origin nuttx-yada
----
David
-----Original Message-----
From: Gregory Nutt [mailto:[email protected]]
Sent: Thursday, December 12, 2019 7:05 PM
To: [email protected]
Subject: Re: Project Emails
> How about sub modules? We atomically tag across both to keep the project
> in
> proper synchronization.
Some of these things are difficult to discuss at this point in time
because we not have enough Apache knowledge and experience. What I have
seen from following the release emails is the release will go through
several release candidates before before a final release is made.
Tagging releases as NuttX did in the past won't support that. I believe
that you would have to use branches to support a series of release
candidates until the release is made (and perhaps even to support
further releases on the branch for bug fixes).
We can't really branch across sub-modules, can we? I think we need to
know much more before we could take any clear position on this.
Greg
