diff options
Diffstat (limited to 'debian/pkg-zsh-workflow.md')
| -rw-r--r-- | debian/pkg-zsh-workflow.md | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/debian/pkg-zsh-workflow.md b/debian/pkg-zsh-workflow.md index 7f37b30ec..1db83f229 100644 --- a/debian/pkg-zsh-workflow.md +++ b/debian/pkg-zsh-workflow.md @@ -120,13 +120,17 @@ the above can be largely automated if the patch applies to the current state of the debian branch. % patchname="cherry-pick-$shortcommitid-description-with-dashes" - % git show $commitid > debian/patches/$patchname + % git show $commitid | filterdiff -x a/ChangeLog > debian/patches/$patchname % sed -e '1 s/^commit/Origin: commit/' -i debian/patches/$patchname % echo $patchname >> debian/patches/series + % $EDITOR debian/patches/$patchname + % git add debian/patches/series debian/patches/$patchname + % git commit -v Patches from upstream will likely include changes to the ChangeLog file. Those changes will probably not apply cleanly, so just open the -created patch file and delete all hunks that do changes in ChangeLog. +created patch file and delete all hunks that do changes in +ChangeLog. The `filterdiff` command above should catch that. % $EDITOR debian/patches/$patchname @@ -134,6 +138,8 @@ Check if the patch applies % quilt push +All the above is mostly automated in `debian/bin/commit2patch`. + ##### Finish import of the patch Refresh the patch to get rid of any fuzz or offset: |