git-machete-intellij-plugin

git-machete-intellij-plugin copied to clipboard

Step to reproduce:

1. create sample repo by script form blogpost
2. rebase build-chain onto parent
3. do Fast Forward Parent Branch To Match Current Branch action on build-chain Then listed commits from allow-ownership-link will disappear:

The solution would most likely entail skipping the reflogs of merged children of X when finding fork point of X

Or maybe even: skipping the reflogs of all merged branches of X when finding fork point of X — so that fork point algorithm doesn't need to know what the children of X are (so far it needs to know what parent of X is, alas... originally it knew nothing about the branch layout completely)

A sample repository state where this can be seen: https://drive.google.com/file/d/1Ed2dVcnk3bKORFn1Iv7DycHYMYOnr-k_/view?usp=sharing

There's a yellow edge b/w develop and master solely b/c backport/v0.8.0 has been merged to the former... this makes no sense, really :/

Whoops... that's not so easy. Specifically, it's not easy to determine which branches are merged to the X (and not just X's ancestors that have never been merged to X) without heavily relying on branch layout... I don't want to further complicate the fork point algorithm unless absolutely necessary.

As a partial light-weight solution, I'd suggest https://github.com/VirtusLab/git-machete-intellij-plugin/issues/633 instead.

Yeah, we've got better support for FP overrides in v3.2.0, let's treat that as a permanent workaround. Much better than complicating the FP algorithm even more 😅