SONARPY-2429: Merge the ruling and the extended ruling #2232
Conversation
Seppli11
changed the base branch from
master
to
ruling-parallelization-master
Seppli11
changed the base branch from
ruling-parallelization-master
to
SONARPY-2130
Seppli11
force-pushed
the
SONARPY-2429
branch
4 times, most recently
from
ee59e91 to
ffb353e
Compare
.gitmodules
Outdated
| [submodule "its/sources_extended"] | ||
| path = its/sources_extended | ||
| [submodule "its/sources_ruling"] | ||
| path = its/sources_ruling | ||
| url = https://github.com/SonarCommunity/python-test-sources.git | ||
| branch = extended |
There was a problem hiding this comment.
I'm a bit confused here, how are we actually retaining the original ruling sources (from master)? It seems the only submodule defined is for the extended branch and that branch hasn't changed?
I'd have expected to see the master-temp branch here?
There was a problem hiding this comment.
On the python-test-sources side, I've essentially merged the two branches into master-temp, which is checked out in the its/sources_ruling submodule.
According to this StackOverflow answer, git keeps track of the hash of the submodules directly in its database. That's probably the reason for the following diff
There was a problem hiding this comment.
I've changed the .gitmodules and added shallow = true (see here for documentation)
Seppli11
force-pushed
the
SONARPY-2429
branch
2 times, most recently
from
2b17964 to
987e442
Compare
this commit moves the submodule and changes the branch of the submodule to a branch which has the sources and extended sources merged
Seppli11
force-pushed
the
SONARPY-2429
branch
from
987e442 to
c310511
Compare
|
SONARPY-2429
This PR is based on SONARPY-2430. Therefore, SONARPY-2430 has to be merged before this PR can be merged into ruling-parallelization-master