git-debrebase: note that we have mostly done the gbp import

[dgit.git] / NOTES.git-debrebase

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 95ad453e0c271d9aaa2a767df3e5be02060df02b..4d7cf20f26912c40babad44d646d5832b31612f5 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
 
 
 import from gbp
 

+[ all this is done now:

  inputs:
    current HEAD (patches-unapplied),
      this is going to be the base of the old breakwater
  inputs:
    current HEAD (patches-unapplied),
      this is going to be the base of the old breakwater


@@ -194,6 +195,7 @@ import from gbp
        commit to remove d/patches
        breakwater pseudomerge with upstream
        "rebase" of pq branch, each commit with d/patches stripped
        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
 
 what about dgit view branch ?
 ideally, would make pseudomerge over dgit view