git-debrebase: notes re psuedomerges

[dgit.git] / NOTES.git-debrebase

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 95ad453e0c271d9aaa2a767df3e5be02060df02b..0310f968dea2a2b0a085b4d40f17236318d54972 100644 (file)
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -174,8 +174,39 @@ 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:
  inputs:
    current HEAD (patches-unapplied),
      this is going to be the base of the old breakwater
@@ -194,9 +225,13 @@ import from gbp
        commit to remove d/patches
        breakwater pseudomerge with upstream
        "rebase" of pq branch, each commit with d/patches stripped
+]
 
 what about dgit view branch ?
 ideally, would make pseudomerge over dgit view
 would need to check that dgit view is actually dgit view of
   ond of our ancestors
 failing that first push will need --overwrite
+
+should this be called import or gbp2debrebase as it is now ?
+gbp uses "import" oddly but I'm tempted to use it normally here.