summaryrefslogtreecommitdiff
path: root/debian/patches/repos-templates
diff options
context:
space:
mode:
authorPeter Samuelson <peter@p12n.org>2012-06-14 02:45:18 +0000
committerPeter Samuelson <peter@p12n.org>2012-06-14 02:45:18 +0000
commit82f97369c687f13dc082c1f3eeefae720e886434 (patch)
treef201cdd004dc7504822d67bcd58fd57f1e15bb9b /debian/patches/repos-templates
parent05b27a75e9948f411343cc7022fec26df8c0218f (diff)
Rediff/refresh some patches for 1.7.
Diffstat (limited to 'debian/patches/repos-templates')
-rw-r--r--debian/patches/repos-templates14
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/repos-templates b/debian/patches/repos-templates
index f532f50..75b1e7c 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
-@@ -287,7 +287,7 @@
+@@ -275,7 +275,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
-@@ -366,8 +366,11 @@
+@@ -354,8 +354,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;
-@@ -454,10 +457,13 @@
+@@ -442,10 +445,13 @@
"$SVNLOOK log -t \"$TXN\" \"$REPOS\" | \\" NL
" grep \"[a-zA-Z0-9]\" > /dev/null || exit 1" NL
"" NL
@@ -44,7 +44,7 @@ hooks, not just use them in place.
"" NL
"# All checks passed, so allow the commit." NL
"exit 0" NL;
-@@ -840,7 +846,7 @@
+@@ -756,7 +762,7 @@
"REPOS=\"$1\"" NL
"REV=\"$2\"" NL
NL
@@ -53,7 +53,7 @@ hooks, not just use them in place.
#undef SCRIPT_NAME
-@@ -901,7 +907,8 @@
+@@ -817,7 +823,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
-@@ -960,7 +967,8 @@
+@@ -876,7 +883,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
-@@ -1025,8 +1033,8 @@
+@@ -941,8 +949,8 @@
"PROPNAME=\"$4\"" NL
"ACTION=\"$5\"" NL
"" NL