On 11.02.25 13:46, Enrico Weigelt, metux IT consult wrote:
On 01.02.25 01:06, Till Wegmueller wrote:
In the git repos exists a directory src/brands which should diverge
between the forks while patches should be moved from https://github.com/
omniosorg/pkg5 into https://github.com/OpenIndiana/pkg5
Ok. First you need is a common baseline (separate branch). Which one
should it be ?
Let's say OI's one shall become the new base line:
in OI's pkg5 repo:
* branch off from master -> let's call it 'common_base'
* now in that branch remove everything that's not common to all
(eg. src/brand)
* rebase the master onto common_base & revert the removal commit again
(yes, "git revert" instead of "git reset HEAD^)
--> common_base branch has that stuff removed
--> master (which based on common_base) has a commit that re-adds
this again
Now the others also need to be rebased onto common_base (and possibly
reintroduce removed stuff) - this can be a bit more tricky ...
How much (or when) have these two diverged ? When's the last common
ancestor ?
The Baseline should be OpenIndiana. They diverged roughly 2011 but have
shared commits until 2015. Not many changes after that in the OI version
and we cherry-picked some commits. But your approach looks like a good
start. Now I need to do it :)
-Till
------------------------------------------
illumos: illumos-discuss
Permalink:
https://illumos.topicbox.com/groups/discuss/Taf30d1b2db20938f-M7b38ba89c289fe302cdca7ce
Delivery options: https://illumos.topicbox.com/groups/discuss/subscription
