X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit-maint-debrebase.7.pod;h=b91ed1648ea676355c3727c7fcd327ea2b7bf375;hb=9e94228f893936a65dea1a05758e523dc7e7d22f;hp=675e2f3b097a31890e268a1c22a55033d55990ca;hpb=e5181bcdc2821a7e36686b83c83437d20d02bbd4;p=dgit.git diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 675e2f3b..b91ed164 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -269,6 +269,11 @@ patches applied. Use =back +If you were not previously using dgit to upload your package (i.e. you +were not using the workflow described in dgit-maint-gbp(7)), and you +happen to have run B in this clone of the repository, +you will need to pass I<--fdiverged> to this command. + =item (C) There is a delta queue, and patches are applied. Use @@ -371,7 +376,7 @@ release: =back Pass I<--stat> just to see the list of changed files, which is useful -to determine whether there are any new or deleted files to may need +to determine whether there are any new or deleted files that may need accounting for in your copyright file. If you obtained a tarball from upstream, you are ready to try a build. @@ -442,6 +447,12 @@ cowbuilder>. Upload with B or B. Remember to pass I<--new> if the package is new in the target suite. +In some cases where you used B since +the last upload, it is not possible for dgit to make your history +fast-forwarding from the history on B. In such cases you +will have to pass I<--overwrite> to dgit. git-debrebase will normally +tell you if this will be needed. + Right before uploading, if you did not just already do so, you might want to have git-debrebase(1) shuffle your branch such that the Debian delta queue appears right at the tip of the branch you will push: @@ -476,7 +487,9 @@ email your archive administrators. For Debian that is Our approach is to maintain a DFSG-clean upstream branch, and create tags on this branch for each release that we want to import. We then -import those tags per "Importing the release", above. +import those tags per "Importing the release", above. In the case of +a new package, we base our initial Debianisation on our first +DFSG-clean tag. For the first upstream release that requires DFSG filtering: @@ -487,11 +500,23 @@ For the first upstream release that requires DFSG filtering: % git commit -m "upstream version 1.2.3 DFSG-cleaned" % git tag -s 1.2.3+dfsg % git checkout master - % # proceed with "Importing the release" on 1.2.3+dfsg tag =back -And for subsequent releases (whether or not they require filtering): +Now either proceed with "Importing the release" on the 1.2.3+dfsg tag, +or in the case of a new package, + +=over 4 + + % git branch --unset-upstream + % git reset --hard 1.2.3+dfsg + +=back + +and proceed with "INITIAL DEBIANISATION". + +For subsequent releases (whether or not they require additional +filtering): =over 4 @@ -534,7 +559,7 @@ In the simplest case, =back -If that fails, because your branch and the NMUers work represent +If that fails, because your branch and the NMUers' work represent divergent branches of development, you have a number of options. Here we describe the two simplest. @@ -627,25 +652,29 @@ package, but this should already be represented in your git history.) The git history made by git-debrebase can seem complicated. Here are some suggestions for helpful invocations of gitk and git. -They can be adapted for other tools like tig, git log, etc. +They can be adapted for other tools like tig(1), git-log(1), magit, etc. -=over +History of package in Debian, disregarding history from upstream: -=item History of package in Debian (disregarding history from upstream): +=over % gitk --first-parent In a laundered branch, the delta queue is at the top. -=item History of the packaging (excluding the delta queue) +=back + +History of the packaging, excluding the delta queue: % gitk :/debian :!/debian/patches -=item Just the delta queue (ie, Debian's changes to upstream): +Just the delta queue (i.e. Debian's changes to upstream): % gitk --first-parent -- :/ :!/debian -=item Full history including old versions of the delta queue: +Full history including old versions of the delta queue: + +=over % gitk --date-order @@ -654,19 +683,24 @@ The "Declare fast forward" commits you see have an older history and a newer history as the other. --date-order makes gitk show the delta queues in the right order. -=item Show complete diff since the last upload: +=back + +Complete diff since the last upload: + +=over % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches -(Includes changes to upstream files.) -=item Interdiff of delta queue since last upload, if you really want that: +This includes changes to upstream files. + +=back + +Interdiff of delta queue since last upload, if you really want it: % git debrebase make-patches % git diff dgit/dgit/sid..HEAD -- debian/patches -=back - -Also of course there is +And of course there is: % git debrebase status