From 8521ee9155c24772c1cc0c3c8b6fa00d7d742e2d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 8 Nov 2018 00:38:22 +0000 Subject: git-debrebase: Document scope of convert-from-gbp In fact this works with any kind of patches-unapplied (or patchless) package. Signed-off-by: Ian Jackson --- git-debrebase.1.pod | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'git-debrebase.1.pod') diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 04a57ee..a964180 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -256,16 +256,33 @@ using dgit quilt-fixup instead should succeed. =item git-debrebase convert-from-gbp [] -Cnnverts a gbp patches-unapplied branch -(not a gbp pq patch queue branch) -into a git-debrebase interchange branch. +Cnnverts any of the following into a git-debrebase interchange branch: -This is done by generating a new anchor merge, -converting the quilt patches as a delta queue, +=over + +=item + +a gbp patches-unapplied branch (but not a gbp pq patch-queue branch) + +=item + +a patches-unapplied git packaging branch containing debian/patches, +as used with quilt + +=item + +a git branch for a package which has no Debian delta - +ie where upstream files are have not been modified in Debian, +so there are no patches + +=back + +The conversion is done by generating a new anchor merge, +converting any quilt patches as a delta queue, and dropping the patches from the tree. The upstream commit-ish should correspond to -the gbp upstream branch, if there is one. +the upstream branch or tag, if there is one. It is a snag if it is not an ancestor of HEAD, or if the history between the upstream and HEAD contains commits which make changes to upstream files. @@ -284,14 +301,14 @@ and if it finds it will make a pseduomerge so that your new git-debrebase view is appropriately fast forward. The result is a well-formed git-debrebase interchange branch. -The result is also fast-forward from the gbp branch. +The result is also fast-forward from the original branch. It is a snag if the new branch looks like it will have diverged, just as for a laundering/unstitching call to git-debrebase; See L, below. Note that it is dangerous not to know whether you are -dealing with a gbp patches-unapplied branch containing quilt patches, +dealing with a (gbp) patches-unapplied branch containing quilt patches, or a git-debrebase interchange branch. At worst, using the wrong tool for the branch format might result in -- cgit v1.2.3 From e1026645bc6576b9b0f4c20e59b5f785c125aff2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 8 Nov 2018 00:39:37 +0000 Subject: git-debrebase: Provide convert-from-unapplied aa alias for -gbp Closes: #905433. Signed-off-by: Ian Jackson --- git-debrebase.1.pod | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'git-debrebase.1.pod') diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index a964180..00b664b 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -254,6 +254,8 @@ If the problem is simply that the existing patches were not made by git-debrebase, using dgit quilt-fixup instead should succeed. +=item git-debrebase convert-from-unapplied [] + =item git-debrebase convert-from-gbp [] Cnnverts any of the following into a git-debrebase interchange branch: @@ -277,6 +279,8 @@ so there are no patches =back +(These two commands operate identically and are simply aliases.) + The conversion is done by generating a new anchor merge, converting any quilt patches as a delta queue, and dropping the patches from the tree. -- cgit v1.2.3