From 00437e1ae60cad96ed6ef46993867fc2d4993ba3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 27 Jul 2018 07:15:39 +0100 Subject: [PATCH] wip --- talk.txt | 38 ++++++++++++++++++++++++++++++++++++++ usps.md | 42 +++++++++++++++--------------------------- 2 files changed, 53 insertions(+), 27 deletions(-) diff --git a/talk.txt b/talk.txt index d6c7fee..0e960b1 100644 --- a/talk.txt +++ b/talk.txt @@ -29,3 +29,41 @@ you make, for Debian, to the upstream parts of the package - as a series of commits. [usps slide] + +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. diff --git a/usps.md b/usps.md index b64a695..c97a0e7 100644 --- a/usps.md +++ b/usps.md @@ -1,37 +1,25 @@ -You can git commit -m fixup! and git commit -m squash! -| always, unlike gbp pq +Standard git-rebase workflow | unlike any +Delta queue editing is immediate and easy | other tool -You can git-am and git-cherry-pick upstream patches -| always, unlike gbp pq +May always git-cherry-pick from upstream | unlike any other +May always git commit -m fixup! | delta queue +May make "mixed" commits | workflow -You may make mixed commits touching debian/ and upstream files -| unlike any other Debian delta queue workflow +No need to switch branches | unlike gbp pq +Tree always dpkg-buildpackage'able | and git-dpm -There is no need to ever use quilt +No editing diffs, or reading diff diffs | unlike many others -There is no in-tree metadata to get out of date -| unlike git-dpm +Working tree is never dirtied | unlike gbp pq -Your working tree is never dirtied by your tools -| unlike gbp pq +No in-tree metadata | unlike git-dpm -There is no need to switch branches or switch views -| unlike gbp pq +git-blame (and git-log file) work | like dgit-maint-merge +Tree makes sense to upstreams & users | and git-dpm -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 +No need to ever use quilt(1) +Can mostly ignore `3.0 (quilt)' .dsc +`3.0 (quilt)' .dsc output is always perfect 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. -- 2.30.2