git-debrebase: notes

[dgit.git] / NOTES.git-debrebase

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 95ad453e0c271d9aaa2a767df3e5be02060df02b..e0a67b5b3ea470d09614934c131e5fc7c8ddf675 100644 (file)
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -176,6 +176,7 @@ so that the overall result will be series of pseudomerges.
 
 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 +195,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.