From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Feb 2018 17:39:25 +0000 (+0000)
Subject: git-debrebase: notes re psuedomerges
X-Git-Tag: archive/debian/5.0~251
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=e30ef7e22058744d48aa1bfa507d7bac17e3ba89

git-debrebase: notes re psuedomerges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

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: