git-debrebase(5): All of README now in (5)

[dgit.git] / NOTES.git-debrebase

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 97038733dca16ae3337a2a29c1e7a41be0be21ab..09237d5973cda501e24ecb4acb4b73c7e4a45a51 100644 (file)
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -6,14 +6,10 @@ TODO
       dgit-maint-debrebase(7)
       someone should set branch.<name>.mergeOptions to include --ff-only ?
 
       dgit-maint-debrebase(7)
       someone should set branch.<name>.mergeOptions to include --ff-only ?
 

-   clean up remains of NOTES and README
+   clean up remains of README

 
    arrange for dgit to automatically stitch on push
 
 
    arrange for dgit to automatically stitch on push
 

-========================================
-
-#  refs/ffq-prev/REF    relates to refs/REF
-

 =======================================
 
 special commit tags
 =======================================
 
 special commit tags


@@ -72,6 +68,8 @@ workflow
 
 Theory for ffq-prev
 
 
 Theory for ffq-prev
 

+  refs/ffq-prev/REF    relates to refs/REF
+

 When we strip a pm, we need to maybe record it (or something) as the
 new start point.
 
 When we strip a pm, we need to maybe record it (or something) as the
 new start point.
 


@@ -155,6 +153,10 @@ N. git-debrebase [--noop-ok] record-ffq-prev
 
     we will teach dgit to do
        git-debrebase stitch
 
     we will teach dgit to do
        git-debrebase stitch

+    or some such ?
+
+following parts are not implemented and maybe aren't the
+best subcommand names etc.

 
 3. git-debrebase push
 
 
 3. git-debrebase push
 


@@ -166,41 +168,16 @@ N. git-debrebase [--noop-ok] record-ffq-prev
     stiches, finalises changelog, signs tags, pushes everything
     for the future, when there is some automatic builder
 
     stiches, finalises changelog, signs tags, pushes everything
     for the future, when there is some automatic builder
 

-ffq-prev for each ref
-    refs/heads/FOO
-is
-    refs/ffq-prev/FOO
-

 ========================================
 
 import from gbp
 
 ========================================
 
 import from gbp
 

-[ all this is done now:
- inputs:
-   current HEAD (patches-unapplied),
-     this is going to be the base of the old breakwater
-   nominated upstream
-
- checks:
-   HEAD:<upstream> = upstream:<upstream>
-   upstream..HEAD:<upstream> is empty (overrideable)
-   upstremm:debian is empty (overrideable)
-
- procedure:
-   construct
-     run gbp pq import to generate pq branch
-     new breakwater is
-       old HEAD
-       commit to remove d/patches
-       anchor merge 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
 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

+that is what is currently implemented

 
 ========================================
 
 
 ========================================
 


@@ -244,6 +221,8 @@ current avaiable strategies:
 
 ========================================
 
 
 ========================================
 

+For downstreams of Debian, sketch of git-ffqrebase
+

 #    git-ffqrebase start [BASE]
 #                # records previous HEAD so it can be overwritten
 #                # records base for future git-ffqrebase
 #    git-ffqrebase start [BASE]
 #                # records previous HEAD so it can be overwritten
 #                # records base for future git-ffqrebase