git-debrebase: test suite: gdr-import-dgit: wip

[dgit.git] / NOTES.git-debrebase

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 25410284ff86de42d832310e4ad000a4f59d3114..ac5a72336b0dab1dce5040e7fa8192f00ac21690 100644 (file)
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -1,5 +1,15 @@
+TODO
+   more tests, see "todo" in gdr-editw
+   reference docs
+      git-debrebase(5)   data model
+      git-debrebase(1)   command line
+   tutorial
+      dgit-maint-debrebase(7)
+
+   clean up remains of NOTES and README
+
+   arrange for dgit to automatically stitch on push

 
 

-#

 #    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


@@ -8,9 +18,7 @@
 #    git-ffqrebase finish
 #    git-ffqrebase status [BRANCH]
 #
 #    git-ffqrebase finish
 #    git-ffqrebase status [BRANCH]
 #

-#  refs/ffqrebase-prev/BRANCH    BRANCH may be refs/...; if not it means
-#  refs/ffqrebase-base/BRANCH      refs/heads/BRANCH
-#                               zero, one, or both of these may exist
+#  refs/ffq-prev/REF    relates to refs/REF

 #
 # git-debrebase without start, if already started, is willing
 # to strip pseudomerges provided that they overwrite exactly
 #
 # git-debrebase without start, if already started, is willing
 # to strip pseudomerges provided that they overwrite exactly


@@ -44,6 +52,7 @@ overall format
 
 [git-debrebase: gbp2debrebase, drop patches]
 [git-debrebase breakwater: declare upstream]
 
 [git-debrebase: gbp2debrebase, drop patches]
 [git-debrebase breakwater: declare upstream]

+[git-debrebase pseudomerge: stitch]

 
 m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]}
 
 
 m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]}
 


@@ -208,11 +217,11 @@ They should be made just before (ideally, part of) dgit push.
         (optionally, can use some other commit which is ff
          from all of the above, eg one of them)
 
         (optionally, can use some other commit which is ff
          from all of the above, eg one of them)
 

-N. git-debrebase record-ffrebase
+N. git-debrebase [--noop-ok] record-ffq-prev

 
      does what is described above
 
 
      does what is described above
 

-2. git-debrebase stitch [--noop-ok]
+2. git-debrebase [--noop-ok] stitch

 
     makes pseudomerge with will-overwrite
     deletes will-overwrite
 
     makes pseudomerge with will-overwrite
     deletes will-overwrite


@@ -233,7 +242,7 @@ N. git-debrebase record-ffrebase
 will-overwrite for each ref
     refs/heads/FOO
 is
 will-overwrite for each ref
     refs/heads/FOO
 is

-    refs/ffrebase/FOO
+    refs/ffq-prev/FOO

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