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
..
conftest.py	[IMP] *: store filestore & forwardport checkouts in temp dirs	2022-08-05 15:35:51 +02:00
test_batches.py	[REF] forwardport: update re_matches to not use a regex	2024-06-04 14:18:04 +02:00
test_conflicts.py	[REF] forwardport: update re_matches to not use a regex	2024-06-04 14:18:04 +02:00
test_limit.py	[CHG] *: move forward-porting over to batches	2024-05-24 09:08:56 +02:00
test_overrides.py	[CHG] *: move forward-porting over to batches	2024-05-24 09:08:56 +02:00
test_simple.py	[REF] forwardport: update re_matches to not use a regex	2024-06-04 14:18:04 +02:00
test_updates.py	[IMP] forwardport: use ORT and zdiff3 for cherrypicks	2024-06-04 14:21:15 +02:00
test_weird.py	[IMP] *: don't remove PRs from batches on close	2024-05-29 07:55:07 +02:00