use mergiraf along with oca-port

[rvalyi]

Hello,

this might may be not impact the source code of oca-port directly, but I would like to make sure you guys heard about the mergiraf git conflict resolution tool. From my little testing mergiraf is REALLY AWESOME, like may be it's fixing 80% or more of the git conflicts I usually encounter while doing ports in the OCA...

1. The tool: https://mergiraf.org/
2. Install: https://mergiraf.org/installation.html
3. Usage: https://mergiraf.org/usage.html

I proposed some initial Python support here https://codeberg.org/mergiraf/mergiraf/pulls/44
You can test my branch by checking it out and doing cargo build; cargo install --path .
So far it worked great for me...

So for oca-port, the whole point will be ensuring the computer where oca-port will run will have mergiraf configured (if that's on an OCA bot for instance). As it will automate most of the git cherry-pick command which have conflicts. This is really something that made me have much more faith we will be able to have effective commit porting bots in the OCA...

[sebalix]

That's really something I would like to see one day: a GH Action responsible to automatically port changes, the pain point was indeed the resolution of conflicts which wouldn't make this feature working very often.

We have to look at mergiraf then, thanks for the hint!
FYI oca-port is doing git format-patch, not git cherry-pick, I don't know if it's an issue for tools like mergiraf as we play with intermediate patches, not commits. To test...

[wetneb]

Hi! Indeed mergiraf doesn't enhance the application of patches yet (except if git is able to translate that to a merge internally). There is some interest in supporting patch workflows.

[rvalyi]

@sebalix @wetneb and instead of waiting mergiraf to support the patch workflow, can we not use git cherry-pick in oca-port or have an option to use it? I've been using git cherry-pick along with mergiraf to port all conflicting PR's in OCA/l10n-brazil, so far so good. But being able to use just simply oca-port would be great...

[wetneb]

I think it would make sense, because even if we're able to add support for patch workflows in mergiraf, it's never going to be as good as doing proper cherry-picks. By going through patches you are discarding a lot of information that is useful to merge, even without mergiraf.

[rvalyi]

so here you go for an oca-port version that is using cherry-pick instead of am which in turn enables the use of mergiraf (it just needs to be installed). Let me know if you prefer it as an option.

#87