diff options
| author | James McCoy <jamessan@debian.org> | 2013-12-30 06:09:40 +0000 |
|---|---|---|
| committer | James McCoy <jamessan@debian.org> | 2013-12-30 06:09:40 +0000 |
| commit | 20d9177e7520d5a27eb88b27329290e699c9255a (patch) | |
| tree | 5527ca87abf8f8c1d9b6d5ebe5b519f9643b8942 /debian/patches/repos-templates | |
| parent | 3b5d723489561260bacba5757359a4bf8f2253ea (diff) | |
Import 1.8.5 and refresh patches
Diffstat (limited to 'debian/patches/repos-templates')
| -rw-r--r-- | debian/patches/repos-templates | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/repos-templates b/debian/patches/repos-templates index 75b1e7c..5e7f71a 100644 --- a/debian/patches/repos-templates +++ b/debian/patches/repos-templates @@ -5,7 +5,7 @@ hooks, not just use them in place. --- a/subversion/libsvn_repos/repos.c +++ b/subversion/libsvn_repos/repos.c -@@ -275,7 +275,7 @@ +@@ -276,7 +276,7 @@ #define PREWRITTEN_HOOKS_TEXT \ "# For more examples and pre-written hooks, see those in" NL \ @@ -14,7 +14,7 @@ hooks, not just use them in place. "# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and" NL \ "# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/" NL -@@ -354,8 +354,11 @@ +@@ -361,8 +361,11 @@ "REPOS=\"$1\"" NL "USER=\"$2\"" NL "" NL @@ -28,7 +28,7 @@ hooks, not just use them in place. "" NL "# All checks passed, so allow the commit." NL "exit 0" NL; -@@ -442,10 +445,13 @@ +@@ -451,10 +454,13 @@ "$SVNLOOK log -t \"$TXN\" \"$REPOS\" | \\" NL " grep \"[a-zA-Z0-9]\" > /dev/null || exit 1" NL "" NL @@ -44,16 +44,16 @@ hooks, not just use them in place. "" NL "# All checks passed, so allow the commit." NL "exit 0" NL; -@@ -756,7 +762,7 @@ - "REPOS=\"$1\"" NL +@@ -775,7 +781,7 @@ "REV=\"$2\"" NL + "TXN_NAME=\"$3\"" NL NL -"mailer.py commit \"$REPOS\" \"$REV\" /path/to/mailer.conf" NL; +"\"$REPOS\"/hooks/mailer.py commit \"$REPOS\" $REV \"$REPOS\"/mailer.conf" NL; #undef SCRIPT_NAME -@@ -817,7 +823,8 @@ +@@ -838,7 +844,8 @@ "USER=\"$2\"" NL "" NL "# Send email to interested parties, let them know a lock was created:" NL @@ -63,7 +63,7 @@ hooks, not just use them in place. #undef SCRIPT_NAME -@@ -876,7 +883,8 @@ +@@ -899,7 +906,8 @@ "USER=\"$2\"" NL "" NL "# Send email to interested parties, let them know a lock was removed:" NL @@ -73,7 +73,7 @@ hooks, not just use them in place. #undef SCRIPT_NAME -@@ -941,8 +949,8 @@ +@@ -966,8 +974,8 @@ "PROPNAME=\"$4\"" NL "ACTION=\"$5\"" NL "" NL |