From e30ef7e22058744d48aa1bfa507d7bac17e3ba89 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Feb 2018 17:39:25 +0000 Subject: [PATCH] git-debrebase: notes re psuedomerges Signed-off-by: Ian Jackson --- NOTES.git-debrebase | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index e0a67b5b..0310f968 100644 --- a/NOTES.git-debrebase +++ b/NOTES.git-debrebase @@ -174,6 +174,36 @@ so that the overall result will be series of pseudomerges. ======================================== +So, pm handling specifics: + +1. git-debrebase [-i etc.] + + should: + check for will-overwrite + if is already a will-overwrite, fine, do no more + if not: + + check our origin branch exists and we are ff from it + if not fail + + check our other might-be-pushed to branches + check we are ff from them + if not fail + + set will-overwrite to something which is ff from + all above branches + either 1. one of them or, if there is no maximal one, + 2. our tip + + ? optionally, according to config always take tip anyway + +2. git-debrebase stitch + + makes pseudomerge with will-overwrite + deletes will-overwrite + +======================================== + import from gbp [ all this is done now: -- 2.30.2