[Pkg-zsh-commits] [zsh] 24/26: Workflow: Mention that merges _must_ be at upstream tags, otherwise Jenkins fails

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch debian
in repository zsh.

commit c10bbbf9f12dc94726d5fa1110674686b8e64393
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Wed Oct 8 22:57:07 2014 +0200

    Workflow: Mention that merges _must_ be at upstream tags, otherwise Jenkins fails
---
 debian/pkg-zsh-workflow.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/pkg-zsh-workflow.md b/debian/pkg-zsh-workflow.md
index 32750be..ecadc02 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
             |

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git