summaryrefslogtreecommitdiff
path: root/NOTES.git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-18 14:53:05 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:06:59 +0100
commit100c26fdeea0746a1a01088bb5db16a81f9d9099 (patch)
treedb33efea5f9e01a4e169dc758cdedc0efff92687 /NOTES.git-debrebase
parent8872ad84313c7a9175c7dfbd63b4c94bc4df6d51 (diff)
git-debrebase: NOTES: record gbp import work done
Diffstat (limited to 'NOTES.git-debrebase')
-rw-r--r--NOTES.git-debrebase22
1 files changed, 1 insertions, 21 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 9703873..32e5edf 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
========================================