git/Reintegrate, branch todoMirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=todo2025-11-20T22:20:25ZReintegrate: show cut lines2025-11-20T22:20:25ZJunio C Hamanogitster@pobox.com2025-11-20T22:20:25Zurn:sha1:4cc73a7b1e1742cdec2e3d9463d91c87a6d26241Meta/cook: fix the reference links2024-07-30T02:08:30ZJunio C Hamanogitster@pobox.com2024-07-30T02:08:27Zurn:sha1:648e17ba94223e02753bdeff0b6a3839002c0edc
Also support "Inviting" as a will-do phrase.
Meta/cook: Sync What's cooking keywords between cook and Reintegrate scripts2024-07-12T22:47:25ZJunio C Hamanogitster@pobox.com2024-07-12T22:47:25Zurn:sha1:a46c71d747834c6bf035d2d404b07f624d7e1169Meta/Reintegrate: allow 'pick' to be empty2024-07-11T21:27:35ZJunio C Hamanogitster@pobox.com2024-07-11T21:27:35Zurn:sha1:4b82ae443e1c2514821432d6e58aa81e9a9963ceMeta/Reintegrate: -u should generate just once2024-07-11T21:27:07ZJunio C Hamanogitster@pobox.com2024-07-11T21:27:07Zurn:sha1:9b9ca896d2a7d333f7f66debdfeac82ba2d6f1afMeta/Reintegrate: work on a detached head2024-03-09T05:47:27ZJunio C Hamanogitster@pobox.com2024-03-09T05:47:27Zurn:sha1:34cee3057e4c77fa71e370cd0d37c4d148a16bb3Reintegrate: cope with delete-modify conflicts2023-12-11T20:40:09ZJunio C Hamanogitster@pobox.com2023-12-11T20:40:09Zurn:sha1:aaf962df4a807886abb21c1a95ba6652a64943eb
A more proper solution is probably to teach "rerere" to remember
what modification (probably indexed via a patch ID for flexibility,
but either the pre- or post-image blob ID without such flexibility
is probably good enough) was deemed "uninteresting" to resolve in
favor of deletion and reapply it when we see another delete-modify
conflict with the same modification, but for now, treat all
delete-modify conflict to be with uninteresting modification.
The way the Reintegrate machinery is used makes it somewhat safer
than it looks---the initial attempt to merge (and come up with a
merge-fix if needed) will always be done using "git merge" and the
resulting commit is manually examined (if only to see if there is a
need for a further merge-fix) before redo-foo script is written out
of the resulting history. We'll need to deal with a case where a
modifying side need to be kept over the deleting side if/when it
arises, but so far I haven't seen such a case in real life.
Meta/Reintegrate: omit source message ID from the merge message2022-10-10T21:33:26ZJunio C Hamanogitster@pobox.com2022-10-10T21:33:26Zurn:sha1:82f56fe383c1c71f3107b6b0f24ad9786afd079cMeta/Reintegrate: Breaks is a significant word2022-01-24T18:35:28ZJunio C Hamanogitster@pobox.com2022-01-24T18:35:28Zurn:sha1:d7f018bfc9ef44fccb88f7586317d2cff75005d9Reintegrate: check coccicheck-pending, too2019-02-28T22:28:15ZJunio C Hamanogitster@pobox.com2019-02-28T22:28:15Zurn:sha1:1bc963bf8c90fde7b34866fc899412d9985299c0