diff options
| author | Peter Samuelson <peter@p12n.org> | 2010-11-08 23:04:33 +0000 |
|---|---|---|
| committer | Peter Samuelson <peter@p12n.org> | 2010-11-08 23:04:33 +0000 |
| commit | fa42bfd262904c10d499aceea868e2e2276d7c9a (patch) | |
| tree | 7a060489199b9b7e2300192e7d548ac5665aa7fa /debian/patches/repos-templates | |
| parent | 4927e8e745ac477e141aafc6102cbf11b89efaec (diff) | |
On 1.7.x branch, refresh patches to apply to trunk r1032687.
The patches now apply, but I haven't tested to see if they _work_.
Diffstat (limited to 'debian/patches/repos-templates')
| -rw-r--r-- | debian/patches/repos-templates | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/repos-templates b/debian/patches/repos-templates index d103e20..59f7a50 100644 --- a/debian/patches/repos-templates +++ b/debian/patches/repos-templates @@ -5,7 +5,7 @@ @DPATCH@ --- a/subversion/libsvn_repos/repos.c +++ b/subversion/libsvn_repos/repos.c -@@ -266,7 +266,7 @@ +@@ -287,7 +287,7 @@ #define PREWRITTEN_HOOKS_TEXT \ "# For more examples and pre-written hooks, see those in" NL \ @@ -14,7 +14,7 @@ "# 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 -@@ -345,8 +345,11 @@ +@@ -366,8 +366,11 @@ "REPOS=\"$1\"" NL "USER=\"$2\"" NL "" NL @@ -28,7 +28,7 @@ "" NL "# All checks passed, so allow the commit." NL "exit 0" NL; -@@ -433,10 +436,13 @@ +@@ -454,10 +457,13 @@ "$SVNLOOK log -t \"$TXN\" \"$REPOS\" | \\" NL " grep \"[a-zA-Z0-9]\" > /dev/null || exit 1" NL "" NL @@ -44,7 +44,7 @@ "" NL "# All checks passed, so allow the commit." NL "exit 0" NL; -@@ -743,7 +749,7 @@ +@@ -840,7 +846,7 @@ "REPOS=\"$1\"" NL "REV=\"$2\"" NL NL @@ -53,7 +53,7 @@ #undef SCRIPT_NAME -@@ -804,7 +810,8 @@ +@@ -901,7 +907,8 @@ "USER=\"$2\"" NL "" NL "# Send email to interested parties, let them know a lock was created:" NL @@ -63,7 +63,7 @@ #undef SCRIPT_NAME -@@ -863,7 +870,8 @@ +@@ -960,7 +967,8 @@ "USER=\"$2\"" NL "" NL "# Send email to interested parties, let them know a lock was removed:" NL @@ -73,7 +73,7 @@ #undef SCRIPT_NAME -@@ -928,8 +936,8 @@ +@@ -1025,8 +1033,8 @@ "PROPNAME=\"$4\"" NL "ACTION=\"$5\"" NL "" NL |