From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 27 Jul 2018 04:51:03 +0000 (+0100)
Subject: wip
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=4e696d9c93ff3ed5ef75e6faa6a08b98d1289d96;p=talk-2018-dc18-gdr.git

wip
---

4e696d9c93ff3ed5ef75e6faa6a08b98d1289d96
diff --git a/junk b/junk
new file mode 100644
index 0000000..6466c10
--- /dev/null
+++ b/junk
@@ -0,0 +1,32 @@
+
+git-debrebase does not do any builds.  You use your existing favourite
+build tools for that.  Nor does git-debrebase do anything to do with
+actual source packages (that is, .dsc files).  Typically, other tools
+will automatically convert your git branch into an identical source
+package, when you upload.
+
+git-debrebase does not deal with orig tarballs, either.  It is a
+purely git tool, so it consumes upstream source code in gitish form.
+Ideally, you base your work on upstream git tags, and an equivalent
+orig tarball (or one made with git-deborig).  Otherwise, you can
+import an upstream tarball with a tool gbp-import-orig.
+
+git-debrebase concentrates on managing the Debian packaging, and the
+Debian delta queue - 
+
+[usp slide]
+
+
+
+
+
+, and the Debian packaging.  - the changes you make
+in bb
+
+
+
+(When you are uploading a new upstream to Debian,
+you'll use tools like git-deborig or git-archive to generate a .orig
+corresponding to the upstream source.)
+
+
diff --git a/talk.txt b/talk.txt
new file mode 100644
index 0000000..d6c7fee
--- /dev/null
+++ b/talk.txt
@@ -0,0 +1,31 @@
+[title slide]
+
+Hi.
+
+[context slide]
+
+Sean Whitton and I are here to present a new git workflow tool for
+Debian packaging.  It's primarily intended for Debian package
+maintainers.  It's an alternative to gbp pq and to git-dpm.
+
+Before I get tell you all about it I need to show where it fits into
+the ecosystem of Debian package management software.  On this slide we
+have you, the maintainer, on the left.  On the right we have the
+Debian repositories.
+
+You may have heard me plugging dgit once or twice.  You should all use
+dgit!  dgit push publishes your git history so Debian's users can use
+it!  But, that's not actually what I am here to talk about today.
+git-debrebase does not need dgit, and dgit does not need
+git-debrebase.
+
+git-debrebase is a tool to help manage your git branch containing the
+Debian version of a package you maintain.  git-debrebase helps you
+maintain a useful git branch with the contents you need (for building
+and uploading).
+
+It maintains your Debian delta queue - that is, that is, the changes
+you make, for Debian, to the upstream parts of the package - as a
+series of commits.
+
+[usps slide]
diff --git a/usps.md b/usps.md
new file mode 100644
index 0000000..b64a695
--- /dev/null
+++ b/usps.md
@@ -0,0 +1,37 @@
+You can git commit -m fixup! and git commit -m squash!
+| always, unlike gbp pq
+
+You can git-am and git-cherry-pick upstream patches
+| always, unlike gbp pq
+
+You may make mixed commits touching debian/ and upstream files
+| unlike any other Debian delta queue workflow
+
+There is no need to ever use quilt
+
+There is no in-tree metadata to get out of date
+| unlike git-dpm
+
+Your working tree is never dirtied by your tools
+| unlike gbp pq
+
+There is no need to switch branches or switch views
+| unlike gbp pq
+
+Your working tree is always buildable, in-tree, with dpkg-buildpackage, debuild, git-buildpackage, etc.
+| unlike gbp pq
+
+You can mostly ignore the `3.0 (quilt)' source package format
+
+During development you do not need any orig tarballs;
+they are only needed when actually uploading to Debian.
+
+The Debian delta queue is managed using a standard git-rebase workflow.
+
+git-log and git-blame on upstream files show the real upstream history
+followed by your delta queue commits, as expected.
+
+git-log and git-blame on debian/ files show your packaging history.
+
+You don't need to edit diffs, or read diffs of diffs.
+Instead, you edit commits the standard git way.