Author: dsahlberg
Date: Tue Nov 26 09:19:17 2024
New Revision: 1922108
URL: http://svn.apache.org/viewvc?rev=1922108&view=rev
Log:
Revert accidental changes in r1922105. It was not intended for commit right
now.
* tools/dev/unix-build/Makefile.svn
Restore merge of Serf-specific sslbuild branch.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1922108&r1=1922107&r2=1922108&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Tue Nov 26 09:19:17 2024
@@ -951,7 +951,7 @@ $(SERF_OBJDIR)/.retrieved:
[ -d $(SERF_OBJDIR) ] || mkdir -p $(SERF_OBJDIR)
if [ ! -d $(SERF_SRCDIR) ]; then \
svn co $(SERF_URL) $(SERF_SRCDIR); \
- #svn merge ^/serf/branches/1.3.x-sslbuild@1910116
$(SERF_SRCDIR); \
+ svn merge ^/serf/branches/1.3.x-sslbuild@1910116
$(SERF_SRCDIR); \
fi
touch $@
