Hi

On Sun, Mar 30, 2025 at 12:51:46AM +0000, softworkz . wrote:
[...]
> When the branch to merge has the same baseline with only the additional commits on top it works fine of course. That's equivalent to the patchsets on the ML needing to be created against the master branch.
> It also works fine for larger merges like when you have a beta that's far ahead of a stable branch and merge it finally into stable.

> But merging something from an older and possible diverged baseline on top of a newer baseline is a different story.

The key word here is diverged.

between mainline and the module branch is a common ancestor
mainline has of course moved forward from the ancestor
and the module branch contains the module and its dependancies
between the ancestor and its HEAD. Thats how it should look.

What you suggest is, there is something additional on the module branch.
That is not possible nor will it work.

For every system, the modules must be kept free of conflicting changes.


> 
> 
> > can you show an example with command line git ?
> > like a simple sequence of commands that result in problems, that i can
> > replicate to look at what happens exactly
> 
> 
> Sure:
> 
> 
> git clone https://git.ffmpeg.org/ffmpeg.git
> 
> cd ffmpeg
> 
> git checkout master
> 
> git remote add softworkz https://github.com/softworkz/FFmpeg
> 
> git fetch softworkz
> 
> # Test 1
> git cherry-pick 39bb78e449a1df67ed5b3b0fafa86af7e115cb36

I suggested "git merge" not cherry pick

splitcc is added into doc/filters.texi into a section you added
in prior commits which have not been picked

git merge 39bb78e449a1df67ed5b3b0fafa86af7e115cb36
in fact merges doc/filters.texi successfully while cherry pick fails
(other unrelated commits cause conflicts in other files but these would
 not be part of any "external module")

the same happens with libavfilter/Makefile
git merge cleanly merges it, cherry pick fails
in allfilters.c case theres a API change (FFFilter/AVFilter)

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

When the tyrant has disposed of foreign enemies by conquest or treaty, and
there is nothing more to fear from them, then he is always stirring up
some war or other, in order that the people may require a leader. -- Plato