diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2014-10-08 22:57:07 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2014-10-08 22:57:07 +0200 |
| commit | c10bbbf9f12dc94726d5fa1110674686b8e64393 (patch) | |
| tree | 452dd66467ea40318a43727ea43b33007572a0a4 | |
| parent | 25102aa5c0714be315c12fe9506e9364736f4969 (diff) | |
| download | zsh-c10bbbf9f12dc94726d5fa1110674686b8e64393.tar.gz zsh-c10bbbf9f12dc94726d5fa1110674686b8e64393.zip | |
Workflow: Mention that merges _must_ be at upstream tags, otherwise Jenkins fails
| -rw-r--r-- | debian/pkg-zsh-workflow.md | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/debian/pkg-zsh-workflow.md b/debian/pkg-zsh-workflow.md index 32750beaf..ecadc0223 100644 --- a/debian/pkg-zsh-workflow.md +++ b/debian/pkg-zsh-workflow.md @@ -14,10 +14,12 @@ Branches Workflow ======== -This is a diagram, that outlines the proposed workflow. Basically, the -`debian` branch walks alongside the `upstream` branch and upstream -changes get merged into `debian` at defined points (for the zsh -package, that should be upstream commit tags). +This diagram outlines the workflow with git branches and +tags. Basically, the `debian` branch walks alongside the `upstream` +branch and upstream changes get merged into `debian` at defined points. +For the zsh package, this _must_ be upstream commit tags -- otherwise +Jenkins +[fails to build the source package](http://jenkins.grml.org/view/Debian/job/zsh-source/219/console). * debian/4.3.11-4 | |