Package: git-dpm Version: 0.8.5-1 Severity: minor Tags: patch I think the attached patch would be a useful addition to the documentation. It would have saved me some trouble if it were there already.
-- System Information: Debian Release: jessie/sid Architecture: i386 (x86_64) Foreign Architectures: amd64 Kernel: Linux 3.13.0-30-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages git-dpm depends on: ii git 1:1.9.1-1 git-dpm recommends no packages. git-dpm suggests no packages. -- no debconf information
Description: Document how to remove patches in the middle of the series Author: Scott Kitterman <[email protected]> --- git-dpm-0.8.5.orig/git-dpm.1 +++ git-dpm-0.8.5/git-dpm.1 @@ -188,6 +188,35 @@ Then push your package: \fBgit\-dpm tag\fP \fBgit push \-\-tags \fP\fItarget\fP\fB unstable:unstable pristine\-tar:pristine\-tar\fP +.IP "Removing existing patches" +First get the master branch: + \fBgit clone\fP \fIURL\fP + +Create the patched branch and check it out: + \fBgit\-dpm checkout\-patched\fP + +Get a list of commits since the last upstream release: +\fBgit rebase \-i upstream\-unstable\fP + +This will open your default editor with a list of commits. Edit the list to +remove undesired commits. + \fI...\fP + \fBgit commit\fP + +Then you want to get those changes into the Debian branch +and the old patch files deleted (which you can do using +\fBgit\-dpm update\-patches\fP), but you most likely want to +also document what you did in the changelog, so all +in one step: + \fBgit\-dpm dch \-\- \-i\fP + +Perhaps change something in the Debian packaging: + \fI...\fP + \fBgit commit \-a\fP + +Then push the whole thing back: + \fBgit push\fP + .SH GLOBAL OPTIONS .TP .B \-\-debug
