From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Feb 2018 14:53:05 +0000 (+0000)
Subject: git-debrebase: NOTES: record gbp import work done
X-Git-Tag: archive/debian/5.0~121
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=100c26fdeea0746a1a01088bb5db16a81f9d9099

git-debrebase: NOTES: record gbp import work done
---

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 97038733..32e5edfe 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -175,32 +175,12 @@ is
 
 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
+that is what is currently implemented
 
 ========================================