Xavier Morel cc9f239261 [IMP] forwardport: use ORT and zdiff3 for cherrypicks ... - zdiff3 should provide better conflict annotations than diff3 - ORT might also provide less conflicts period - always perform cherrypicks without rename limit, since we're re-trying every failure without rename limit, it seems like unnecessary work, assuming git only ever looks as far as it needs - also enable copy support maybe... Fixes #827		2024-06-04 14:21:15 +02:00
..
changelog	[ADD] *: changelog entries I forgot	2023-08-14 09:28:19 +02:00
data	[ADD] runbot_merge: PR dashboard V2	2024-05-29 07:55:07 +02:00
migrations	[CHG] *: rewrite commands set, rework status management	2024-05-23 07:58:46 +02:00
models	[IMP] forwardport: use ORT and zdiff3 for cherrypicks	2024-06-04 14:21:15 +02:00
tests	[IMP] forwardport: use ORT and zdiff3 for cherrypicks	2024-06-04 14:21:15 +02:00
__init__.py	[ADD] mergebot, forwardbot: changelog	2021-10-20 15:16:48 +02:00
__manifest__.py	[CHG] *: rewrite commands set, rework status management	2024-05-23 07:58:46 +02:00
controllers.py	[IMP] rewrite /forwardport/outstanding	2023-07-10 15:23:31 +02:00