X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=NOTES.git-debrebase;h=cafab1a771f61f681a6380039f15b6f012537d4e;hp=1cfa070b2d2046c3705395687e13825a6524c9ce;hb=9156ead35a760f394274c4b33e9a8f019e712f6d;hpb=efd164b666d95dec51c55c1dfe4364e59c360add

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 1cfa070b..cafab1a7 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -1,5 +1,8 @@
 TODO
-   more tests, see "todo" in gdr-editw
+   test case for new-upstream-v0
+
+   --anchor option to specify commit(s) to treat as as anchor(s)
+
    reference docs
       git-debrebase(5)   data model
       git-debrebase(1)   command line
@@ -45,29 +48,29 @@ overall format
 [git-debrebase: split mixed commit, debian part]
 [git-debrebase: split mixed commit, upstream-part]
 [git-debrebase: convert dgit import, debian changes]
-[git-debrebase breakwater: convert dgit import, upstream changes]
+[git-debrebase anchor: convert dgit import, upstream changes]
 
 [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]
-[git-debrebase breakwater: new upstream NEW-UPSTREAM-VERSION, merge]
+[git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]
 [git-debrebase: new upstream NEW-UPSTREAM-VERSION, changelog]
 
 [git-debrebase convert-from-gbp: drop patches]
-[git-debrebase breakwater: declare upstream]
+[git-debrebase anchor: declare upstream]
 [git-debrebase pseudomerge: stitch]
 
 [git-debrebase convert-to-gbp: commit patches]
 
 m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]}
 
-Every breakwater commit must be a merge.  In principle, this is not
+Every anchor commit must be a merge.  In principle, this is not
 necessary.  After all, we are relying on the
-    [git-debrebase breakwater: ...]
-commit message annotation in "declare" breakwater merges (which
-do not have any upstream changes), to distinguish those breakwater
+    [git-debrebase anchor: ...]
+commit message annotation in "declare" anchor merges (which
+do not have any upstream changes), to distinguish those anchor
 merges from ordinary pseudomerges (which we might just try to strip).
 
 However, the user is going to be doing git-rebase a lot.  We really
-don't want them to rewrite a breakwater base commit.  git-rebase
+don't want them to rewrite an anchor commit.  git-rebase
 trips up on merges, so that is a useful safety catch.
 
 
@@ -268,7 +271,7 @@ import from gbp
      new breakwater is
        old HEAD
        commit to remove d/patches
-       breakwater pseudomerge with upstream
+       anchor merge with upstream
        "rebase" of pq branch, each commit with d/patches stripped
 ]