From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 9 Feb 2018 21:49:49 +0000 (+0000)
Subject: git-debrebase: some notes about gbp import
X-Git-Tag: archive/debian/5.0~273
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=257ed0b02dadd4538f515807189acdd95d88c320;hp=880af0a90f1b02db4607e94d38555f2e86af47a3

git-debrebase: some notes about gbp import

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index c268d759..0d7bea84 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -140,3 +140,31 @@ will-overwrite to the current tip (see rules above, which show that
 this is OK).  Or maybe to the last pseudomerge on the current tip,
 so that the overall result will be series of pseudomerges.
 
+========================================
+
+import from gbp
+
+ 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
+       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