svn commit: r1295004 - in /subversion/trunk: build.conf build/win32/vc6-build.bat.in subversion/svnmucc/ subversion/tests/cmdline/svntest/main.py tools/client-side/svnmucc/
Author: danielsh
Date: Wed Feb 29 08:16:17 2012
New Revision: 1295004
URL: http://svn.apache.org/viewvc?rev=1295004view=rev
Log:
* build/win32/vc6-build.bat.in: Add svnrdump.
Added:
subversion/trunk/subversion/svnmucc/
- copied from r1294995, subversion/trunk/tools/client-side/svnmucc/
Removed:
subversion/trunk/tools/client-side/svnmucc/
Modified:
subversion/trunk/build.conf
subversion/trunk/build/win32/vc6-build.bat.in
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/build.conf
URL:
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1295004r1=1295003r2=1295004view=diff
==
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Feb 29 08:16:17 2012
@@ -174,6 +174,15 @@ libs = libsvn_client libsvn_ra libsvn_re
install = bin
manpages = subversion/svnrdump/svnrdump.1
+[svnmucc]
+description = Subversion Multiple URL Command Client
+type = exe
+path = subversion/svnmucc
+libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr neon
+# TODO: svn-tools/svnmucc-svnmucc compat symlink
+install = bin
+# TODO: write this manpages = subversion/svnmucc/svnmucc.1
+
# Support for GNOME Keyring
[libsvn_auth_gnome_keyring]
description = Subversion GNOME Keyring Library
@@ -1191,13 +1200,6 @@ libs = __JAVAHL__ javahl-tests javahl-co
#
# Contrib and tools
-[svnmucc]
-type = exe
-path = tools/client-side/svnmucc
-sources = svnmucc.c
-install = tools
-libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr neon
-
[diff]
type = exe
path = tools/diff
Modified: subversion/trunk/build/win32/vc6-build.bat.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/win32/vc6-build.bat.in?rev=1295004r1=1295003r2=1295004view=diff
==
--- subversion/trunk/build/win32/vc6-build.bat.in (original)
+++ subversion/trunk/build/win32/vc6-build.bat.in Wed Feb 29 08:16:17 2012
@@ -136,6 +136,7 @@ copy src-%DIR%\Release\subversion\svndum
copy src-%DIR%\Release\subversion\svnlook\svnlook.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\svnserve\svnserve.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\svnversion\svnversion.exe svn-win32-%VER%\bin
+copy src-%DIR%\Release\subversion\svnrdump\svnrdump.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\mod_authz_svn\mod_authz_svn.so
svn-win32-%VER%\httpd
copy src-%DIR%\Release\subversion\mod_dav_svn\mod_dav_svn.so
svn-win32-%VER%\httpd
copy svn-win32-%VER%\bin\intl.dll %APACHEDIR%\bin
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1295004r1=1295003r2=1295004view=diff
==
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Wed Feb 29
08:16:17 2012
@@ -161,13 +161,12 @@ svnsync_binary = os.path.abspath('../../
svnversion_binary = os.path.abspath('../../svnversion/svnversion' + _exe)
svndumpfilter_binary = os.path.abspath('../../svndumpfilter/svndumpfilter' + \
_exe)
+svnmucc_binary=os.path.abspath('../../svnmucc/svnmucc' + _exe)
entriesdump_binary = os.path.abspath('entries-dump' + _exe)
atomic_ra_revprop_change_binary = os.path.abspath('atomic-ra-revprop-change' +
\
_exe)
wc_lock_tester_binary = os.path.abspath('../libsvn_wc/wc-lock-tester' + _exe)
wc_incomplete_tester_binary =
os.path.abspath('../libsvn_wc/wc-incomplete-tester' + _exe)
-svnmucc_binary=os.path.abspath('../../../tools/client-side/svnmucc/svnmucc' + \
- _exe)
# Location to the pristine repository, will be calculated from test_area_url
# when we know what the user specified for --url.
svn commit: r1295005 - /subversion/trunk/
Author: danielsh Date: Wed Feb 29 08:17:54 2012 New Revision: 1295005 URL: http://svn.apache.org/viewvc?rev=1295005view=rev Log: Revert r1295004, which contained numerous accidental changes. Added: subversion/trunk/ - copied from r1295004, subversion/trunk/
svn propchange: r1295004 - svn:log
Author: danielsh Revision: 1295004 Modified property: svn:log Modified: svn:log at Wed Feb 29 08:20:30 2012 -- --- svn:log (original) +++ svn:log Wed Feb 29 08:20:30 2012 @@ -1 +1,5 @@ * build/win32/vc6-build.bat.in: Add svnrdump. + +* everywhere else: accidentally-committed changes. + +[ Reverted in r1295005 due to the accidental changes. ]
svn commit: r1295006 - /subversion/trunk/
Author: danielsh Date: Wed Feb 29 08:22:01 2012 New Revision: 1295006 URL: http://svn.apache.org/viewvc?rev=1295006view=rev Log: Revert r1295004, which contained numerous accidental changes. Added: subversion/trunk/ - copied from r1295003, subversion/trunk/
svn propchange: r1295005 - svn:log
Author: danielsh Revision: 1295005 Modified property: svn:log Modified: svn:log at Wed Feb 29 08:22:57 2012 -- --- svn:log (original) +++ svn:log Wed Feb 29 08:22:57 2012 @@ -1 +1 @@ -Revert r1295004, which contained numerous accidental changes. +Accidental inoperative commit. See r1295006 for the right one.
svn commit: r1295007 - in /subversion/trunk/build/win32: make_dist.py vc6-build.bat.in
Author: danielsh
Date: Wed Feb 29 08:24:27 2012
New Revision: 1295007
URL: http://svn.apache.org/viewvc?rev=1295007view=rev
Log:
Update some windows build scripts, which may or may not be in used by
some people.
* build/win32/vc6-build.bat.in
* build/win32/make_dist.py
Add svnrdump.
Modified:
subversion/trunk/build/win32/make_dist.py
subversion/trunk/build/win32/vc6-build.bat.in
Modified: subversion/trunk/build/win32/make_dist.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/win32/make_dist.py?rev=1295007r1=1295006r2=1295007view=diff
==
--- subversion/trunk/build/win32/make_dist.py (original)
+++ subversion/trunk/build/win32/make_dist.py Wed Feb 29 08:24:27 2012
@@ -209,6 +209,8 @@ _disttree = {'': OptFile('%(readme)s', '
File('%(blddir)s/svnserve/svnserve.pdb'),
File('%(blddir)s/svnversion/svnversion.exe'),
File('%(blddir)s/svnversion/svnversion.pdb'),
+ File('%(blddir)s/svnrdump/svnrdump.exe'),
+ File('%(blddir)s/svnrdump/svnrdump.pdb'),
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.exe'),
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.pdb'),
File('%(blddir)s/../tools/client-side/svnmucc/svnmucc.exe'),
Modified: subversion/trunk/build/win32/vc6-build.bat.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/win32/vc6-build.bat.in?rev=1295007r1=1295006r2=1295007view=diff
==
--- subversion/trunk/build/win32/vc6-build.bat.in (original)
+++ subversion/trunk/build/win32/vc6-build.bat.in Wed Feb 29 08:24:27 2012
@@ -136,6 +136,7 @@ copy src-%DIR%\Release\subversion\svndum
copy src-%DIR%\Release\subversion\svnlook\svnlook.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\svnserve\svnserve.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\svnversion\svnversion.exe svn-win32-%VER%\bin
+copy src-%DIR%\Release\subversion\svnrdump\svnrdump.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\mod_authz_svn\mod_authz_svn.so
svn-win32-%VER%\httpd
copy src-%DIR%\Release\subversion\mod_dav_svn\mod_dav_svn.so
svn-win32-%VER%\httpd
copy svn-win32-%VER%\bin\intl.dll %APACHEDIR%\bin
svn commit: r1295009 - /subversion/branches/1.7.x/STATUS
Author: danielsh Date: Wed Feb 29 08:26:36 2012 New Revision: 1295009 URL: http://svn.apache.org/viewvc?rev=1295009view=rev Log: * STATUS: Nominate r1295007. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1295009r1=1295008r2=1295009view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Feb 29 08:26:36 2012 @@ -80,6 +80,15 @@ Candidate changes: Votes: +1: danielsh + * r1295007 + Include svnrdump in the Windows build. + Justification: + I do not know for sure, but I assume that either make-dist.py or + vc6-build.bat.in is actually used by some people --- and if I'm wrong, + this would be harmless. + Votes: + +1: danielsh + Veto-blocked changes: =
svn commit: r1295010 - /subversion/trunk/tools/dev/windows-build/Makefile
Author: danielsh Date: Wed Feb 29 08:28:54 2012 New Revision: 1295010 URL: http://svn.apache.org/viewvc?rev=1295010view=rev Log: * tools/dev/windows-build/Makefile: Add svnrdump support, paralleling the svnversion support. Modified: subversion/trunk/tools/dev/windows-build/Makefile Modified: subversion/trunk/tools/dev/windows-build/Makefile URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/windows-build/Makefile?rev=1295010r1=1295009r2=1295010view=diff == --- subversion/trunk/tools/dev/windows-build/Makefile (original) +++ subversion/trunk/tools/dev/windows-build/Makefile Wed Feb 29 08:28:54 2012 @@ -107,7 +107,7 @@ config: targetdir libsvn_auth_gnome_keyring libsvn_auth_kwallet libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_base libsvn_fs_fs libsvn_fs_util libsvn_ra libsvn_ra_local libsvn_ra_neon libsvn_ra_serf libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc: targetdir $(MSBUILD) /t:Libraries\$@ $(MAKE) package -svn svnadmin svndumpfilter svnlook svnmucc svnserve svnsync svnversion entries-dump: targetdir +svn svnadmin svndumpfilter svnlook svnmucc svnserve svnsync svnversion svnrdump entries-dump: targetdir $(MSBUILD) /t:Programs\$@ $(MAKE) package auth-test cache-test changes-test checksum-test client-test compat-test config-test db-test diff-diff3-test dir-delta-editor dirent_uri-test error-test fs-base-test fs-pack-test fs-test hashdump-test key-test locks-test mergeinfo-test opt-test path-test ra-local-test random-test repos-test revision-test skel-test stream-test string-test strings-reps-test svn_test_fs svn_test_main svndiff-test target-test time-test translate-test tree-conflict-data-test utf-test vdelta-test window-test: targetdir @@ -128,7 +128,7 @@ all2: targetdir package: test -d $(SVNDIR)\$(CONFIG)\Subversion\tests\cmdline || mkdir $(SVNDIR)\$(CONFIG)\Subversion\tests\cmdline test -d $(TARGETDIR)\bin || mkdir $(TARGETDIR)\bin - for %%i in (svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion) do @$(CP) $(CONFIG)\subversion\%%i\%%i.exe $(TARGETDIR)\bin + for %%i in (svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion svnrdump) do @$(CP) $(CONFIG)\subversion\%%i\%%i.exe $(TARGETDIR)\bin for %%i in (diff diff3 diff4) do @if exist $(CONFIG)\tools\diff\%%i.exe $(CP) $(CONFIG)\tools\diff\%%i.exe $(TARGETDIR)\bin $(CP) $(APRDIR)\$(CONFIG)/*.dll $(TARGETDIR)\bin $(CP) $(APRUTILDIR)\$(CONFIG)/*.dll $(TARGETDIR)\bin
svn commit: r1295018 - /subversion/trunk/CHANGES
Author: gstein Date: Wed Feb 29 08:59:10 2012 New Revision: 1295018 URL: http://svn.apache.org/viewvc?rev=1295018view=rev Log: * CHANGES: add a line about SvnPubSub (pls feel free to edit) Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1295018r1=1295017r2=1295018view=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Wed Feb 29 08:59:10 2012 @@ -20,6 +20,7 @@ http://svn.apache.org/repos/asf/subversi * new SVNHooksEnv configuration option for mod_dav_svn (r1239966) * new --ignore-properties option for 'svn diff' (r1239553. -617) * new --patch-compatible option for 'svn diff' (r1239561) +* new SvnPubSub distributed commit hooks (tools/server-side/svnpubsub) - Client-side bugfixes: *
svn commit: r1295019 - /subversion/branches/svnmucc/
Author: danielsh Date: Wed Feb 29 09:05:30 2012 New Revision: 1295019 URL: http://svn.apache.org/viewvc?rev=1295019view=rev Log: Create a branch for svnmucc as subversion/svnmucc/. Added: subversion/branches/svnmucc/ (props changed) - copied from r1295018, subversion/trunk/ Propchange: subversion/branches/svnmucc/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Feb 29 09:05:30 2012 @@ -0,0 +1,2 @@ +[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+ +(\d+) Propchange: subversion/branches/svnmucc/ -- bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID% Propchange: subversion/branches/svnmucc/ -- --- svn:ignore (added) +++ svn:ignore Wed Feb 29 09:05:30 2012 @@ -0,0 +1,50 @@ +ChangeLog* +Makefile +config.cache +config.log +config.nice +config.status +configure +libtool +.gdb_history +.swig_checked +*.orig +*.rej +TAGS +tags +neon +build-outputs.mk +autogen-standalone.mk +autom4te.cache +gen-make.opts +tests.log* +fails.log* +db4-win32 +db +*.o +*~ +.*~ +apr +apr-util +apr-iconv +Release +Debug +ipch +subversion_msvc.dsw +subversion_msvc.ncb +subversion_msvc.opt +subversion_msvc.plg +subversion_vcnet.sln +subversion_vcnet.ncb +subversion_vcnet.suo +subversion_vcnet.sdf +subversion_vcnet.opensdf +mkmf.log +.project +.classpath +.cdtproject +.settings +.cproject +zlib +sqlite-amalgamation +serf Propchange: subversion/branches/svnmucc/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Feb 29 09:05:30 2012 @@ -0,0 +1,59 @@ +/subversion/branches/1.5.x-r30215:870312 +/subversion/branches/1.7.x-fs-verify:1146708,1161180 +/subversion/branches/atomic-revprop:965046-1000689 +/subversion/branches/bdb-reverse-deltas:872050-872529 +/subversion/branches/diff-callbacks3:870059-870761 +/subversion/branches/diff-optimizations:1031270-1037352 +/subversion/branches/diff-optimizations-bytes:1037353-1067789 +/subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118 +/subversion/branches/double-delete:870511-872970 +/subversion/branches/explore-wc:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997 +/subversion/branches/file-externals:871779-873302 +/subversion/branches/fs-rep-sharing:869036-873803 +/subversion/branches/fsfs-pack:873717-874575 +/subversion/branches/gnome-keyring:870558-871410 +/subversion/branches/gpg-agent-password-store:1005036-1150766 +/subversion/branches/http-protocol-v2:874395-876041 +/subversion/branches/in-memory-cache:869829-871452 +/subversion/branches/integrate-cache-item-serialization:1068724-1068739 +/subversion/branches/integrate-cache-membuffer:998649-998852 +/subversion/branches/integrate-compression-level:1068651-1072287 +/subversion/branches/integrate-io-improvements:1068684-1072297 +/subversion/branches/integrate-is-cachable:1072568-1074082 +/subversion/branches/integrate-partial-getter:1072558-1076552 +/subversion/branches/integrate-readline-speedup:1072553-1072555 +/subversion/branches/integrate-stream-api-extensions:1068695-1072516 +/subversion/branches/integrate-string-improvements:1068251-1190617 +/subversion/branches/integrate-txdelta-caching:1072541-1078213 +/subversion/branches/issue-2779-dev:965496-984198 +/subversion/branches/issue-2843-dev:871432-874179 +/subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734 +/subversion/branches/issue-3067-deleted-subtrees:873375-874084 +/subversion/branches/issue-3148-dev:875193-875204 +/subversion/branches/issue-3220-dev:872210-872226 +/subversion/branches/issue-3242-dev:879653-896436 +/subversion/branches/issue-3334-dirs:875156-875867 +/subversion/branches/issue-3975:1152931-1160746 +/subversion/branches/kwallet:870785-871314 +/subversion/branches/log-g-performance:870941-871032 +/subversion/branches/merge-skips-obstructions:874525-874615 +/subversion/branches/nfc-nfd-aware-client:870276,870376
svn commit: r1295023 - in /subversion/branches/svnmucc: ./ build/win32/ subversion/svnmucc/ subversion/tests/cmdline/svntest/ tools/client-side/svnmucc/ tools/dev/windows-build/
Author: danielsh Date: Wed Feb 29 09:11:44 2012 New Revision: 1295023 URL: http://svn.apache.org/viewvc?rev=1295023view=rev Log: Promote tools/client-side/svnmucc/ - subversion/svnmucc/. * tools/client-side/svnmucc/: Move to.. * subversion/svnmucc/: .. here. * Makefile.in (check, davcheck, davautocheck, svncheck, svnserveautocheck, svncheck6, svnsshcheck, bdbcheck): Remove the explicit svnmucc dependency; svnmucc has become a transitive dependency via the 'bin' target. * build.conf (svnmucc): Move this section and match it to the other built-in binaries' sections. * win-tests.py: Track directory move. * subversion/tests/cmdline/svntest/main.py (svnmucc_binary): Track the binary's move. * build/win32/make_dist.py Track the binary's move. * build/win32/vc6-build.bat.in * tools/dev/windows-build/Makefile Copy svnmucc too. Added: subversion/branches/svnmucc/subversion/svnmucc/ - copied from r1295006, subversion/trunk/tools/client-side/svnmucc/ Removed: subversion/branches/svnmucc/tools/client-side/svnmucc/ Modified: subversion/branches/svnmucc/Makefile.in subversion/branches/svnmucc/build.conf subversion/branches/svnmucc/build/win32/make_dist.py subversion/branches/svnmucc/build/win32/vc6-build.bat.in subversion/branches/svnmucc/subversion/tests/cmdline/svntest/main.py subversion/branches/svnmucc/tools/dev/windows-build/Makefile subversion/branches/svnmucc/win-tests.py Modified: subversion/branches/svnmucc/Makefile.in URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/Makefile.in?rev=1295023r1=1295022r2=1295023view=diff == --- subversion/branches/svnmucc/Makefile.in (original) +++ subversion/branches/svnmucc/Makefile.in Wed Feb 29 09:11:44 2012 @@ -454,7 +454,7 @@ check-all-javahl: check-apache-javahl ch # make check CLEANUP=true will clean up directories for successful tests. # make check TESTS=subversion/tests/cmdline/basic_tests.py # will perform only basic tests (likewise for other tests). -check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc +check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@ @if test $(PYTHON) != none; then \ flags=--verbose; \ if test $(CLEANUP) != ; then \ @@ -504,38 +504,38 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $ # First, set up Apache as documented in # subversion/tests/cmdline/README. -davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc +davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod @$(MAKE) check BASE_URL=http://localhost # Automatically configure and run Apache httpd on a random port, and then # run make check. -davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc +davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod @# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment. @APXS=$(APXS) bash $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh # First, run: # subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline -svncheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc +svncheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ @$(MAKE) check BASE_URL=svn://127.0.0.1 # 'make svnserveautocheck' runs svnserve for you and kills it. -svnserveautocheck: svnserve bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc +svnserveautocheck: svnserve bin $(TEST_DEPS) @BDB_TEST_DEPS@ @env PYTHON=$(PYTHON) THREADED=$(THREADED) \ $(top_srcdir)/subversion/tests/cmdline/svnserveautocheck.sh # First, run: # subversion/svnserve/svnserve --listen-host ::1 -d -r `pwd`/subversion/tests/cmdline -svncheck6: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc +svncheck6: bin $(TEST_DEPS) @BDB_TEST_DEPS@ @$(MAKE) check BASE_URL=svn://\[::1\] # First make sure you can ssh to localhost and that svnserve is in # the path of the resulting shell. -svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc +svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ @$(MAKE) check \ BASE_URL=svn+ssh://localhost`pwd`/subversion/tests/cmdline -bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc +bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ @$(MAKE) check FS_TYPE=bdb check-clean: Modified: subversion/branches/svnmucc/build.conf URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/build.conf?rev=1295023r1=1295022r2=1295023view=diff == --- subversion/branches/svnmucc/build.conf (original) +++ subversion/branches/svnmucc/build.conf Wed Feb 29 09:11:44 2012 @@ -174,6 +174,16 @@ libs = libsvn_client libsvn_ra libsvn_re install = bin manpages = subversion/svnrdump/svnrdump.1 +[svnmucc] +description = Subversion Multiple URL Command Client +type = exe +path =
svn commit: r1295025 - /subversion/branches/svnmucc/BRANCH-README
Author: danielsh Date: Wed Feb 29 09:14:40 2012 New Revision: 1295025 URL: http://svn.apache.org/viewvc?rev=1295025view=rev Log: On the svnmucc branch, add a BRANCH-README. Added: subversion/branches/svnmucc/BRANCH-README Added: subversion/branches/svnmucc/BRANCH-README URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/BRANCH-README?rev=1295025view=auto == --- subversion/branches/svnmucc/BRANCH-README (added) +++ subversion/branches/svnmucc/BRANCH-README Wed Feb 29 09:14:40 2012 @@ -0,0 +1,8 @@ +Branch that promotes svnmucc to subversion/svnmucc/. + +TODO: Write a manpage + +TODO: Make 'make install-tools' install a compatibility symlink: +$(DESTDIR)/bin/svn-tools/svnmucc - $(DESTDIR)/bin/svnmucc + +TODO: Determine whether there is consensus to merge this to trunk
svn commit: r1295034 - in /subversion/branches/svnmucc: BRANCH-README subversion/svnmucc/svnmucc.1
Author: danielsh Date: Wed Feb 29 09:33:44 2012 New Revision: 1295034 URL: http://svn.apache.org/viewvc?rev=1295034view=rev Log: On the svnmucc branch, write a manpage. * subversion/svnmucc/svnmucc.1: New file. * BRANCH-README: Remove this task. Added: subversion/branches/svnmucc/subversion/svnmucc/svnmucc.1 - copied, changed from r1295019, subversion/branches/svnmucc/subversion/svnversion/svnversion.1 Modified: subversion/branches/svnmucc/BRANCH-README Modified: subversion/branches/svnmucc/BRANCH-README URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/BRANCH-README?rev=1295034r1=1295033r2=1295034view=diff == --- subversion/branches/svnmucc/BRANCH-README (original) +++ subversion/branches/svnmucc/BRANCH-README Wed Feb 29 09:33:44 2012 @@ -1,7 +1,5 @@ Branch that promotes svnmucc to subversion/svnmucc/. -TODO: Write a manpage - TODO: Make 'make install-tools' install a compatibility symlink: $(DESTDIR)/bin/svn-tools/svnmucc - $(DESTDIR)/bin/svnmucc Copied: subversion/branches/svnmucc/subversion/svnmucc/svnmucc.1 (from r1295019, subversion/branches/svnmucc/subversion/svnversion/svnversion.1) URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/subversion/svnmucc/svnmucc.1?p2=subversion/branches/svnmucc/subversion/svnmucc/svnmucc.1p1=subversion/branches/svnmucc/subversion/svnversion/svnversion.1r1=1295019r2=1295034rev=1295034view=diff == --- subversion/branches/svnmucc/subversion/svnversion/svnversion.1 (original) +++ subversion/branches/svnmucc/subversion/svnmucc/svnmucc.1 Wed Feb 29 09:33:44 2012 @@ -21,12 +21,12 @@ .\ You can view this file with: .\ nroff -man [filename] .\ -.TH svnversion 1 +.TH svnmucc 1 .SH NAME -svnversion \- Produce a compact version number for a working copy. +svnmucc \- Multiple URL Command Client for Subversion .SH SYNOPSIS .TP -\fBsvnversion\fP [\fIwc_path\fP [\fItrail_url\fP]] +\fBsvnmucc\fP [\fIoptions\fP] .SH OVERVIEW Subversion is a version control system, which allows you to keep old versions of files and directories (usually source code), keep a log of @@ -44,4 +44,4 @@ explanations of the \fBsvn\fP, \fBsvnadm approaches and reasonings, etc., can be found at http://svnbook.red-bean.com/. -Run `svnversion --help' to access the built-in tool documentation. +Run `svnmucc --help' to access the built-in tool documentation.
svn commit: r1295051 - in /subversion/branches/svnmucc: BRANCH-README Makefile.in build/generator/gen_make.py
Author: danielsh Date: Wed Feb 29 10:06:09 2012 New Revision: 1295051 URL: http://svn.apache.org/viewvc?rev=1295051view=rev Log: On the svnmucc branch, install a compatibility symlink. * Makefile.in (INSTALL_EXTRA_TOOLS): New. * build/generator/gen_make.py (Generator.write): Add 'tools' to the list of install= areas that have an associated INSTALL_EXTRA_$(AREA) target. See the source of build-outputs.mk --- namely build/generator/templates/makefile.ezt --- for the gory details. * BRANCH-README: Remove this task. Modified: subversion/branches/svnmucc/BRANCH-README subversion/branches/svnmucc/Makefile.in subversion/branches/svnmucc/build/generator/gen_make.py Modified: subversion/branches/svnmucc/BRANCH-README URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/BRANCH-README?rev=1295051r1=1295050r2=1295051view=diff == --- subversion/branches/svnmucc/BRANCH-README (original) +++ subversion/branches/svnmucc/BRANCH-README Wed Feb 29 10:06:09 2012 @@ -1,6 +1,3 @@ Branch that promotes svnmucc to subversion/svnmucc/. -TODO: Make 'make install-tools' install a compatibility symlink: -$(DESTDIR)/bin/svn-tools/svnmucc - $(DESTDIR)/bin/svnmucc - TODO: Determine whether there is consensus to merge this to trunk Modified: subversion/branches/svnmucc/Makefile.in URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/Makefile.in?rev=1295051r1=1295050r2=1295051view=diff == --- subversion/branches/svnmucc/Makefile.in (original) +++ subversion/branches/svnmucc/Makefile.in Wed Feb 29 10:06:09 2012 @@ -872,3 +872,9 @@ extraclean-ctypes-python: clean-ctypes-p # manually describe a dependency, which we won't otherwise detect subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-metadata.sql subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-checks.sql + +# Compatibility symlink. +# This runs after the target of the same name in build-outputs.mk. +INSTALL_EXTRA_TOOLS=\ + $(MKDIR) $(DESTDIR)$(bindir); \ + ln -s $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT) Modified: subversion/branches/svnmucc/build/generator/gen_make.py URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/build/generator/gen_make.py?rev=1295051r1=1295050r2=1295051view=diff == --- subversion/branches/svnmucc/build/generator/gen_make.py (original) +++ subversion/branches/svnmucc/build/generator/gen_make.py Wed Feb 29 10:06:09 2012 @@ -410,7 +410,8 @@ class Generator(gen_base.GeneratorBase): # in Makefile.in ### we should turn AREA into an object, then test it instead of this if area[:5] == 'swig-' and area[-4:] != '-lib' or \ - area[:7] == 'javahl-': + area[:7] == 'javahl-' \ + or area == 'tools': ezt_area.extra_install = 'yes'
svn commit: r1295055 - /subversion/trunk/subversion/libsvn_ra_serf/locks.c
Author: danielsh
Date: Wed Feb 29 10:25:51 2012
New Revision: 1295055
URL: http://svn.apache.org/viewvc?rev=1295055view=rev
Log:
Eliminate a compiler warning.
(The code on 1.7.x names the outer variable differently, thus avoiding
the warning.)
* subversion/libsvn_ra_serf/locks.c
(svn_ra_serf__unlock):
Tweak the logic flow to avoid variable shadowing. This was
harmless due to an unconditional 'continue;' statement in the
block that declares the shadowing variable.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/locks.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/locks.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/locks.c?rev=1295055r1=1295054r2=1295055view=diff
==
--- subversion/trunk/subversion/libsvn_ra_serf/locks.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/locks.c Wed Feb 29 10:25:51 2012
@@ -716,8 +716,6 @@ svn_ra_serf__unlock(svn_ra_session_t *ra
token = existing_lock-token;
if (!token)
{
- svn_error_t *err;
-
err = svn_error_createf(SVN_ERR_RA_NOT_LOCKED, NULL,
_('%s' is not locked in the
repository),
path);
@@ -728,11 +726,15 @@ svn_ra_serf__unlock(svn_ra_session_t *ra
err2 = lock_func(lock_baton, path, FALSE, NULL, err,
iterpool);
svn_error_clear(err);
+ err = NULL;
if (err2)
return svn_error_trace(err2);
}
else
-svn_error_clear(err);
+{
+ svn_error_clear(err);
+ err = NULL;
+}
continue;
}
}
svn propchange: r1292402 - svn:log
Author: neels Revision: 1292402 Modified property: svn:log Modified: svn:log at Wed Feb 29 13:02:36 2012 -- --- svn:log (original) +++ svn:log Wed Feb 29 13:02:36 2012 @@ -1,2 +1,8 @@ On the 1.7.x-issue4102 branch, merge the following from trunk, resolving conflicts: r1233292, r1245711, r1245746, r1245764, r1245809, r1245929, r1245935 + +Modification of r1245711: +svn_kind_t does not exist in 1.7.x. So instead of using svn_kind_t in +svn_wc__db_t.parse_cache, add an IS_SYMLINK flag next to the svn_node_kind_t. +Also affects get_path_kind() and svn_wc__db_wcroot_parse_local_abspath() +in wc_db_wcroot.c.
svn commit: r1295145 - /subversion/branches/1.7.x/STATUS
Author: neels Date: Wed Feb 29 15:13:52 2012 New Revision: 1295145 URL: http://svn.apache.org/viewvc?rev=1295145view=rev Log: STATUS: Vote, approved #4102 fix. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1295145r1=1295144r2=1295145view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Feb 29 15:13:52 2012 @@ -50,16 +50,6 @@ Candidate changes: Votes: +1: rhuijben - * r1233292, r1245711, r1245746, r1245764, r1245809, r1245929, r1245935, r1293577 - Fix various problems with symlinks pointing at externals (issue #4102). - Justification: - Regression from 1.6.x. Users complained: - http://svn.haxx.se/users/archive-2012-02/0266.shtml - Branch: - ^/subversion/branches/1.7.x-issue4102 - Votes: - +1: stsp, rhuijben - * r1293945, r1293972, r1293976, r1293998, r1294136, r1294236; r1294134, r1294147, r1294586 Two interdependent changes: @@ -96,3 +86,13 @@ Veto-blocked changes: Approved changes: = + + * r1233292, r1245711, r1245746, r1245764, r1245809, r1245929, r1245935, r1293577 + Fix various problems with symlinks pointing at externals (issue #4102). + Justification: + Regression from 1.6.x. Users complained: + http://svn.haxx.se/users/archive-2012-02/0266.shtml + Branch: + ^/subversion/branches/1.7.x-issue4102 + Votes: + +1: stsp, rhuijben, neels
svn commit: r1295148 - /subversion/trunk/subversion/include/svn_error.h
Author: hwright
Date: Wed Feb 29 15:20:18 2012
New Revision: 1295148
URL: http://svn.apache.org/viewvc?rev=1295148view=rev
Log:
When running the clang static analyzer, it is useful to use a vanilla assert,
rather than our custom one, so make it so.
* subversion/include/svn_error.h
(SVN_ERR_ASSERT): Optionally alias to assert() if running in the clang static
analyzer.
Modified:
subversion/trunk/subversion/include/svn_error.h
Modified: subversion/trunk/subversion/include/svn_error.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_error.h?rev=1295148r1=1295147r2=1295148view=diff
==
--- subversion/trunk/subversion/include/svn_error.h (original)
+++ subversion/trunk/subversion/include/svn_error.h Wed Feb 29 15:20:18 2012
@@ -479,11 +479,16 @@ svn_error_t *svn_error_purge_tracing(svn
*
* @since New in 1.6.
*/
+#ifdef __clang_analyzer__
+#include assert.h
+#define SVN_ERR_ASSERT(expr) assert((expr))
+#else
#define SVN_ERR_ASSERT(expr)\
do { \
if (!(expr))\
SVN_ERR(svn_error__malfunction(TRUE, __FILE__, __LINE__, #expr)); \
} while (0)
+#endif
/** Similar to SVN_ERR_ASSERT(), but without the option of returning
* an error to the calling function.
svn commit: r1295151 - /subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py
Author: hwright
Date: Wed Feb 29 15:28:27 2012
New Revision: 1295151
URL: http://svn.apache.org/viewvc?rev=1295151view=rev
Log:
* tools/server-side/svnpubsub/svnpubsub/server.py:
I before E, except after C, or when sounding as A as in 'neighbor' and 'weigh'
Modified:
subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py
Modified: subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py?rev=1295151r1=1295150r2=1295151view=diff
==
--- subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py Wed Feb 29
15:28:27 2012
@@ -37,7 +37,7 @@
# URL is built into 3 parts:
# /${type}/${optional_repo_uuid}/${format}
#
-# If the repository UUID is included in the URl, you will only recieve
+# If the repository UUID is included in the URl, you will only receive
# messages about that repository.
#
# Example Pub clients:
svn commit: r1295180 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: hwright Date: Wed Feb 29 16:25:12 2012 New Revision: 1295180 URL: http://svn.apache.org/viewvc?rev=1295180view=rev Log: Fix failing merge test with Ev2 by using UnorderedOutput. Current number of failing Ev2 tests: 4 * subversion/tests/cmdline/merge_tests.py (merge_range_prior_to_rename_source_existence): Don't rely on output ordering. Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1295180r1=1295179r2=1295180view=diff == --- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Wed Feb 29 16:25:12 2012 @@ -14124,11 +14124,13 @@ def merge_range_prior_to_rename_source_e 'move', sbox.repo_url + '/A/D/H/nu', sbox.repo_url + '/A/D/H/nu_moved', '-m', 'Move nu to nu_moved') - svntest.actions.run_and_verify_svn(None, - [Updating '%s':\n % (wc_dir), - D + nu_path + \n, - A + nu_moved_path + \n, - Updated to revision 12.\n], + expected_output = svntest.verify.UnorderedOutput( +[Updating '%s':\n % (wc_dir), + D + nu_path + \n, + A + nu_moved_path + \n, + Updated to revision 12.\n], +) + svntest.actions.run_and_verify_svn(None, expected_output, [], 'up', wc_dir) # Now merge -r7:12 from A to A_COPY.
svn commit: r1295185 - /subversion/trunk/subversion/libsvn_client/repos_diff.c
Author: hwright
Date: Wed Feb 29 16:51:35 2012
New Revision: 1295185
URL: http://svn.apache.org/viewvc?rev=1295185view=rev
Log:
Ev2 shims: Make sure we use the proper base revision (if one is provided) when
fetching base content for repos diff.
Current number of Ev2 test failures: 1 (and it only happens on OS X)
* subversion/libsvn_client/repos_diff.c
(fetch_kind_func, fetch_props_func, fetch_base_func): Use the base revision,
if it is valid.
Modified:
subversion/trunk/subversion/libsvn_client/repos_diff.c
Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1295185r1=1295184r2=1295185view=diff
==
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Wed Feb 29 16:51:35
2012
@@ -1317,7 +1317,10 @@ fetch_kind_func(svn_kind_t *kind,
struct edit_baton *eb = baton;
svn_node_kind_t node_kind;
- SVN_ERR(svn_ra_check_path(eb-ra_session, path, eb-revision, node_kind,
+ if (!SVN_IS_VALID_REVNUM(base_revision))
+base_revision = eb-revision;
+
+ SVN_ERR(svn_ra_check_path(eb-ra_session, path, base_revision, node_kind,
scratch_pool));
*kind = svn__kind_from_node_kind(node_kind, FALSE);
@@ -1335,12 +1338,15 @@ fetch_props_func(apr_hash_t **props,
struct edit_baton *eb = baton;
svn_node_kind_t node_kind;
- SVN_ERR(svn_ra_check_path(eb-ra_session, path, eb-revision, node_kind,
+ if (!SVN_IS_VALID_REVNUM(base_revision))
+base_revision = eb-revision;
+
+ SVN_ERR(svn_ra_check_path(eb-ra_session, path, base_revision, node_kind,
scratch_pool));
if (node_kind == svn_node_file)
{
- SVN_ERR(svn_ra_get_file(eb-ra_session, path, eb-revision,
+ SVN_ERR(svn_ra_get_file(eb-ra_session, path, base_revision,
NULL, NULL, props, result_pool));
}
else if (node_kind == svn_node_dir)
@@ -1348,7 +1354,7 @@ fetch_props_func(apr_hash_t **props,
apr_array_header_t *tmp_props;
SVN_ERR(svn_ra_get_dir2(eb-ra_session, NULL, NULL, props, path,
- eb-revision, 0 /* Dirent fields */,
+ base_revision, 0 /* Dirent fields */,
result_pool));
tmp_props = svn_prop_hash_to_array(*props, result_pool);
SVN_ERR(svn_categorize_props(tmp_props, NULL, NULL, tmp_props,
@@ -1375,11 +1381,14 @@ fetch_base_func(const char **filename,
svn_stream_t *fstream;
svn_error_t *err;
+ if (!SVN_IS_VALID_REVNUM(base_revision))
+base_revision = eb-revision;
+
SVN_ERR(svn_stream_open_unique(fstream, filename, NULL,
svn_io_file_del_on_pool_cleanup,
result_pool, scratch_pool));
- err = svn_ra_get_file(eb-ra_session, path, eb-revision,
+ err = svn_ra_get_file(eb-ra_session, path, base_revision,
fstream, NULL, NULL, scratch_pool);
if (err err-apr_err == SVN_ERR_FS_NOT_FOUND)
{
svn commit: r1295187 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: danielsh
Date: Wed Feb 29 17:05:20 2012
New Revision: 1295187
URL: http://svn.apache.org/viewvc?rev=1295187view=rev
Log:
Add a regression test for issue #4132.
* subversion/tests/cmdline/merge_tests.py
(svnmucc_abuse_1): New test, XFail.
(test_list): Run it.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1295187r1=1295186r2=1295187view=diff
==
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Wed Feb 29
17:05:20 2012
@@ -17357,6 +17357,55 @@ def unnecessary_noninheritable_mergeinfo
None, None, None, None, None, 1, 1,
'--depth', 'immediates', B_branch_path)
+#--
+# Test for issue #4132, merge of replaced source asserts.
+# The original use-case is the following merges, which both asserted:
+#svn merge -cr1295005 ^/subversion/trunk@1295000 ../src
+#svn merge -cr1295004 ^/subversion/trunk/@r1295004 ../src
+@Issue(4132)
+@XFail()
+def svnmucc_abuse_1(sbox):
+ svnmucc: merge a replacement
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ ## Using A/ as our trunk, since one cannot replace the root.
+
+ ## r2: open a branch
+ sbox.simple_repo_copy('A', 'A_COPY')
+
+ ## r3: padding (to make the revnums-mod-10 match)
+ sbox.simple_repo_copy('iota', 'padding')
+
+ ## r4: trunk: accidental change
+ sbox.simple_append('A/mu', 'accidental change')
+ sbox.simple_commit()
+
+ ## r5: fail to revert it
+ svntest.actions.run_and_verify_svnmucc(None, None, [],
+ '-m', 'r5',
+ '-U', sbox.repo_url,
+ 'rm', 'A',
+ 'cp', 'HEAD', 'A', 'A')
+
+ ## r6: really revert it
+ svntest.actions.run_and_verify_svnmucc(None, None, [],
+ '-m', 'r6',
+ '-U', sbox.repo_url,
+ 'rm', 'A',
+ 'cp', '3', 'A', 'A')
+
+ ## Attempt to merge that.
+ # This used to assert:
+ # --- Recording mergeinfo for merge of r5 into
'svn-test-work/working_copies/merge_tests-125/A_COPY':
+ # subversion/libsvn_subr/mergeinfo.c:1172: (apr_err=235000)
+ # svn: E235000: In file 'subversion/libsvn_subr/mergeinfo.c' line 1172:
assertion failed (IS_VALID_FORWARD_RANGE(first))
+ sbox.simple_update()
+ svntest.main.run_svn(None, 'merge', '-c', 'r5', '^/A@r5',
+ sbox.ospath('A_COPY'))
+
+
# Run the tests
@@ -17487,6 +17536,7 @@ test_list = [ None,
record_only_merge_adds_new_subtree_mergeinfo,
unnecessary_noninheritable_mergeinfo_missing_subtrees,
unnecessary_noninheritable_mergeinfo_shallow_merge,
+ svnmucc_abuse_1,
]
if __name__ == '__main__':
svn commit: r1295201 - /subversion/trunk/tools/diff/diff.c
Author: philip
Date: Wed Feb 29 18:19:37 2012
New Revision: 1295201
URL: http://svn.apache.org/viewvc?rev=1295201view=rev
Log:
Add -w to diff tool to ignore whitespace.
* tools/diff/diff.c
(main): Create diff options earlier and set ignore_space_all on -w.
Modified:
subversion/trunk/tools/diff/diff.c
Modified: subversion/trunk/tools/diff/diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/diff/diff.c?rev=1295201r1=1295200r2=1295201view=diff
==
--- subversion/trunk/tools/diff/diff.c (original)
+++ subversion/trunk/tools/diff/diff.c Wed Feb 29 18:19:37 2012
@@ -89,6 +89,8 @@ int main(int argc, const char *argv[])
options_array = apr_array_make(pool, 0, sizeof(const char *));
+ diff_options = svn_diff_file_options_create(pool);
+
for (i = 1 ; i argc ; i++)
{
if (!no_more_options (argv[i][0] == '-'))
@@ -105,6 +107,11 @@ int main(int argc, const char *argv[])
show_c_function = TRUE;
continue;
}
+ if (argv[i][1] == 'w' !argv[i][2])
+{
+ diff_options-ignore_space = svn_diff_file_ignore_space_all;
+ continue;
+}
APR_ARRAY_PUSH(options_array, const char *) = argv[i];
}
else
@@ -127,8 +134,6 @@ int main(int argc, const char *argv[])
return 2;
}
- diff_options = svn_diff_file_options_create(pool);
-
svn_err = svn_diff_file_options_parse(diff_options, options_array, pool);
if (svn_err)
{
svn commit: r1295230 - /subversion/trunk/subversion/libsvn_delta/compat.c
Author: hwright
Date: Wed Feb 29 19:34:30 2012
New Revision: 1295230
URL: http://svn.apache.org/viewvc?rev=1295230view=rev
Log:
* subversion/libsvn_delta/compat.c
(run_ev2_actions, drive_tree): Break long lines, no functional change.
Modified:
subversion/trunk/subversion/libsvn_delta/compat.c
Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1295230r1=1295229r2=1295230view=diff
==
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Wed Feb 29 19:34:30 2012
@@ -498,7 +498,8 @@ run_ev2_actions(void *edit_baton,
iterpool = svn_pool_create(scratch_pool);
for (i = 0; i sorted_hash-nelts; i++)
{
- svn_sort__item_t *item = APR_ARRAY_IDX(sorted_hash, i,
svn_sort__item_t);
+ svn_sort__item_t *item = APR_ARRAY_IDX(sorted_hash, i,
+ svn_sort__item_t);
apr_array_header_t *actions = item-value;
const char *path = item-key;
@@ -1572,7 +1573,8 @@ drive_tree(struct operation *op,
{
/* Open or create our baton. */
if (op-operation == OP_OPEN || op-operation == OP_PROPSET)
-SVN_ERR(editor-open_directory(path, parent_op-baton,
op-base_revision,
+SVN_ERR(editor-open_directory(path, parent_op-baton,
+ op-base_revision,
scratch_pool, op-baton));
else if (op-operation == OP_ADD || op-operation == OP_REPLACE)
svn commit: r1295266 - /subversion/trunk/subversion/libsvn_fs_base/fs.c
Author: cmpilato Date: Wed Feb 29 20:52:29 2012 New Revision: 1295266 URL: http://svn.apache.org/viewvc?rev=1295266view=rev Log: * subversion/libsvn_fs_base/fs.c (bdb_write_config): In the Subversion-generated DB_CONFIG file text, update URLs to Berkeley DB documentation and mailing list archives. While here, consistify the formatting a bit. Modified: subversion/trunk/subversion/libsvn_fs_base/fs.c Modified: subversion/trunk/subversion/libsvn_fs_base/fs.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/fs.c?rev=1295266r1=1295265r2=1295266view=diff == --- subversion/trunk/subversion/libsvn_fs_base/fs.c (original) +++ subversion/trunk/subversion/libsvn_fs_base/fs.c Wed Feb 29 20:52:29 2012 @@ -333,9 +333,10 @@ bdb_write_config(svn_fs_t *fs) #\n # Make sure you read the documentation at:\n #\n -# http://www.oracle.com/technology/documentation/berkeley-db/db/ref/lock/max.html\n; +# http://docs.oracle.com/cd/E17076_02/html/programmer_reference/lock_max.html\n; #\n # before tweaking these values.\n +#\n set_lk_max_locks 2000\n set_lk_max_lockers 2000\n set_lk_max_objects 2000\n @@ -344,9 +345,9 @@ bdb_write_config(svn_fs_t *fs) #\n # Make sure you read the documentation at:\n #\n -# http://www.oracle.com/technology/documentation/berkeley-db/db/api_c/env_set_lg_bsize.html\n; -# http://www.oracle.com/technology/documentation/berkeley-db/db/api_c/env_set_lg_max.html\n; -# http://www.oracle.com/technology/documentation/berkeley-db/db/ref/log/limits.html\n; +# http://docs.oracle.com/cd/E17076_02/html/api_reference/C/envset_lg_bsize.html\n; +# http://docs.oracle.com/cd/E17076_02/html/api_reference/C/envset_lg_max.html\n; +# http://docs.oracle.com/cd/E17076_02/html/programmer_reference/log_limits.html\n; #\n # Increase the size of the in-memory log buffer from the default\n # of 32 Kbytes to 256 Kbytes. Decrease the log file size from\n @@ -354,24 +355,28 @@ bdb_write_config(svn_fs_t *fs) # space required for hot backups. The size of the log file must be\n # at least four times the size of the in-memory log buffer.\n #\n -# Note: Decreasing the in-memory buffer size below 256 Kbytes\n -# will hurt commit performance. For details, see this post from\n -# Daniel Berlin d...@dberlin.org:\n +# Note: Decreasing the in-memory buffer size below 256 Kbytes will hurt\n +# hurt commit performance. For details, see:\n +#\n +# http://svn.haxx.se/dev/archive-2002-02/0141.shtml\n; #\n -# http://subversion.tigris.org/servlets/ReadMsg?list=devmsgId=161960\n; set_lg_bsize 262144\n set_lg_max 1048576\n #\n # If you see \log region out of memory\ errors, bump lg_regionmax.\n -# See http://www.oracle.com/technology/documentation/berkeley-db/db/ref/log/config.html\n; -# and http://svn.haxx.se/users/archive-2004-10/1001.shtml for more.\n +# For more information, see:\n +#\n +# http://docs.oracle.com/cd/E17076_02/html/programmer_reference/log_config.html\n; +# http://svn.haxx.se/users/archive-2004-10/1000.shtml\n; +#\n set_lg_regionmax 131072\n #\n /* ### Configure this with svnadmin create --bdb-cache-size */ # The default cache size in BDB is only 256k. As explained in\n -# http://svn.haxx.se/dev/archive-2004-12/0369.shtml, this is too\n +# http://svn.haxx.se/dev/archive-2004-12/0368.shtml, this is too\n # small for most applications. Bump this number if \db_stat -m\\n # shows too many cache misses.\n +#\n set_cachesize0 1048576 1\n; /* Run-time configurable options. @@ -397,11 +402,12 @@ bdb_write_config(svn_fs_t *fs) # Disable fsync of log files on transaction commit. Read the\n # documentation about DB_TXN_NOSYNC at:\n #\n - # http://www.oracle.com/technology/documentation/berkeley-db/db/ref/log/config.html\n; + # http://docs.oracle.com/cd/E17076_02/html/programmer_reference/log_config.html\n; #\n - # [requires Berkeley DB 4.0]\n, + # [requires Berkeley DB 4.0]\n + #\n, /* inactive */ - # set_flags DB_TXN_NOSYNC\n, + #set_flags DB_TXN_NOSYNC\n, /* active */ set_flags DB_TXN_NOSYNC\n }, /* Controlled by svnadmin create --bdb-log-keep */ @@ -411,11 +417,12 @@ bdb_write_config(svn_fs_t *fs) # Enable automatic removal of unused transaction log files.\n # Read the documentation about DB_LOG_AUTOREMOVE at:\n #\n - # http://www.oracle.com/technology/documentation/berkeley-db/db/ref/log/config.html\n; + # http://docs.oracle.com/cd/E17076_02/html/programmer_reference/log_config.html\n; #\n - # [requires Berkeley DB 4.2]\n, + # [requires Berkeley DB 4.2]\n + #\n, /*
svn commit: r1295287 - /subversion/trunk/subversion/libsvn_delta/compat.c
Author: hwright
Date: Wed Feb 29 21:25:19 2012
New Revision: 1295287
URL: http://svn.apache.org/viewvc?rev=1295287view=rev
Log:
Ev2 shims: Improve the order we use to drive the shims by keeping track of the
order actions were added, rather than sorting them manually. This improves
both performance and correctness, particularly on case-insensitive filesystems.
Current number of Ev2 test failures: 0
* subversion/libsvn_delta/compat.c
(ev2_edit_baton): Add path_order member.
(add_action): If we haven't seen the path before, put it on the order list.
(run_ev2_actions): Use the pre-populated order list, rather than creating
one of our own via a sort.
(delta_from_editor): Initialize the path_order list.
Modified:
subversion/trunk/subversion/libsvn_delta/compat.c
Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1295287r1=1295286r2=1295287view=diff
==
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Wed Feb 29 21:25:19 2012
@@ -129,7 +129,10 @@ struct extra_baton
struct ev2_edit_baton
{
svn_editor_t *editor;
+
apr_hash_t *paths;
+ apr_array_header_t *path_order;
+
apr_pool_t *edit_pool;
struct extra_baton *exb;
svn_boolean_t closed;
@@ -221,10 +224,12 @@ add_action(struct ev2_edit_baton *eb,
if (action_list == NULL)
{
+ const char *path_dup = apr_pstrdup(eb-edit_pool, path);
+
action_list = apr_array_make(eb-edit_pool, 1,
sizeof(struct path_action *));
- apr_hash_set(eb-paths, apr_pstrdup(eb-edit_pool, path),
- APR_HASH_KEY_STRING, action_list);
+ apr_hash_set(eb-paths, path_dup, APR_HASH_KEY_STRING, action_list);
+ APR_ARRAY_PUSH(eb-path_order, const char *) = path_dup;
}
APR_ARRAY_PUSH(action_list, struct path_action *) = p_action;
@@ -484,30 +489,28 @@ run_ev2_actions(void *edit_baton,
apr_pool_t *scratch_pool)
{
struct ev2_edit_baton *eb = edit_baton;
- apr_array_header_t *sorted_hash;
apr_pool_t *iterpool;
- int i;
-
- /* Sort the paths touched by this edit.
- * Ev2 doesn't really have any particular need for depth-first-ness, but
- * we want to ensure all parent directories are handled before children in
- * the case of adds (which does introduce an element of depth-first-ness). */
- sorted_hash = svn_sort__hash(eb-paths, svn_sort_compare_items_as_paths,
- scratch_pool);
iterpool = svn_pool_create(scratch_pool);
- for (i = 0; i sorted_hash-nelts; i++)
+ while (eb-path_order-nelts 0)
{
- svn_sort__item_t *item = APR_ARRAY_IDX(sorted_hash, i,
- svn_sort__item_t);
- apr_array_header_t *actions = item-value;
- const char *path = item-key;
+ const char *path = APR_ARRAY_IDX(eb-path_order, 0, const char *);
+ apr_array_header_t *actions = apr_hash_get(eb-paths, path,
+ APR_HASH_KEY_STRING);
svn_pool_clear(iterpool);
SVN_ERR(process_actions(edit_baton, path, actions, iterpool));
- /* Remove this item from the hash. */
+ /* Remove this item from the hash... */
apr_hash_set(eb-paths, path, APR_HASH_KEY_STRING, NULL);
+
+ /* ...and from the front of the path_order list.
+
+ ### This is wrong on so many levels, but since APR doesn't support
+ proper queue operations, it'll have to do. */
+ eb-path_order-nelts--;
+ eb-path_order-nalloc--;
+ eb-path_order-elts += eb-path_order-elt_size;
}
svn_pool_destroy(iterpool);
@@ -964,6 +967,7 @@ delta_from_editor(const svn_delta_editor
eb-editor = editor;
eb-paths = apr_hash_make(pool);
+ eb-path_order = apr_array_make(pool, 1, sizeof(const char *));
eb-edit_pool = pool;
eb-found_abs_paths = found_abs_paths;
*eb-found_abs_paths = FALSE;
Re: svn commit: r1295287 - /subversion/trunk/subversion/libsvn_delta/compat.c
On Wed, Feb 29, 2012 at 3:25 PM, hwri...@apache.org wrote: Author: hwright Date: Wed Feb 29 21:25:19 2012 New Revision: 1295287 URL: http://svn.apache.org/viewvc?rev=1295287view=rev Log: Ev2 shims: Improve the order we use to drive the shims by keeping track of the order actions were added, rather than sorting them manually. This improves both performance and correctness, particularly on case-insensitive filesystems. Current number of Ev2 test failures: 0 Yes, you read that correctly. For those keeping score at home, after almost 6 months of work, the the testsuite now completely passes over ra_local with the Ev2 shims enabled. (ra_svn and ra_dav are a separate story...) -Hyrum -- uberSVN: Apache Subversion Made Easy http://www.uberSVN.com/
Re: svn commit: r1295287 - /subversion/trunk/subversion/libsvn_delta/compat.c
On Feb 29, 2012 4:28 PM, Hyrum K Wright hyrum.wri...@wandisco.com wrote: On Wed, Feb 29, 2012 at 3:25 PM, hwri...@apache.org wrote: Author: hwright Date: Wed Feb 29 21:25:19 2012 New Revision: 1295287 URL: http://svn.apache.org/viewvc?rev=1295287view=rev Log: Ev2 shims: Improve the order we use to drive the shims by keeping track of the order actions were added, rather than sorting them manually. This improves both performance and correctness, particularly on case-insensitive filesystems. Current number of Ev2 test failures: 0 Yes, you read that correctly. For those keeping score at home, after almost 6 months of work, the the testsuite now completely passes over ra_local with the Ev2 shims enabled. Congratulations! Awesome work. Cheers, -g
svn commit: r1295303 - /subversion/trunk/subversion/po/de.po
Author: astieger Date: Wed Feb 29 21:59:53 2012 New Revision: 1295303 URL: http://svn.apache.org/viewvc?rev=1295303view=rev Log: * subversion/po/de.po : Fix 45 fuzzy strings. Modified: subversion/trunk/subversion/po/de.po Modified: subversion/trunk/subversion/po/de.po URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/po/de.po?rev=1295303r1=1295302r2=1295303view=diff == --- subversion/trunk/subversion/po/de.po [UTF-8] (original) +++ subversion/trunk/subversion/po/de.po [UTF-8] Wed Feb 29 21:59:53 2012 @@ -53,6 +53,7 @@ # property Eigenschaft # PROPNAME PROPNAME # PROPVAL PROPWERT +# reintegrate wiedereingliedern # relocate umplatzieren # REPOSPA # REPOS_PATH ARCHIV_PFAD @@ -482,9 +483,8 @@ msgid The specified path has an unexpec msgstr Der angegebene Pfad hat einen unerwarteten Status #: ../include/svn_error_codes.h:508 -#, fuzzy msgid The working copy needs to be upgraded -msgstr Die Arbeitskopie fehlt +msgstr Die Arbeitskopie muss in ein neueres Format gebracht werden #: ../include/svn_error_codes.h:513 msgid Previous operation was interrupted; run 'svn cleanup' @@ -775,9 +775,8 @@ msgid Repository root URL does not matc msgstr Die URL der Projektarchivwurzel entspricht nicht der erwarteten Wurzel-URL #: ../include/svn_error_codes.h:854 -#, fuzzy msgid Session URL does not match expected session URL -msgstr Die URL der Projektarchivwurzel entspricht nicht der erwarteten Wurzel-URL +msgstr Die Sitzungs-URL entspricht nicht der erwarteten Sitzungs-URL #: ../include/svn_error_codes.h:860 msgid RA layer failed to init socket layer @@ -1699,13 +1698,13 @@ msgid '%s' already exists msgstr »%s« existiert bereits #: ../libsvn_client/export.c:866 ../libsvn_wc/update_editor.c:4161 -#, fuzzy, c-format +#, c-format msgid Checksum mismatch for '%s':\n expected: %s\n actual: %s\n msgstr -Prüfsummenfehler, Datei »%s«:\n +Prüfsummenfehler für Datei »%s«:\n Erwartet:%s\n Tatsächlich: %s\n @@ -1912,32 +1911,30 @@ msgstr Die Zusammenführung aus fremdem #: ../libsvn_client/merge.c:8522 ../libsvn_client/merge.c:9021 #: ../libsvn_client/merge.c:10523 -#, fuzzy, c-format +#, c-format msgid Merge target '%s' does not exist in the working copy -msgstr Pfad »%s« ist nicht in der Arbeitskopie enthalten +msgstr Zusammenführungsziel »%s« ist nicht in der Arbeitskopie enthalten #: ../libsvn_client/merge.c:8896 -#, fuzzy msgid Cannot merge into a working copy with a switched subtree -msgstr Kann nicht zurück in eine Arbeitskopie mit umgestelltem Unterbaum integrieren +msgstr Kann nicht in eine Arbeitskopie mit umgestelltem Unterbaum zusammenführen #: ../libsvn_client/merge.c:8901 -#, fuzzy msgid Cannot merge into a working copy that has local modifications -msgstr Kann nicht zurück in eine Arbeitskopie integrieren, die lokale Änderungen hat +msgstr Kann nicht in eine Arbeitskopie mit lokalen Änderungen zusammenführen #: ../libsvn_client/merge.c:8918 msgid Cannot determine revision of working copy msgstr Die Revision der Arbeitskopie kann nicht bestimmt werden #: ../libsvn_client/merge.c:8924 -#, fuzzy, c-format +#, c-format msgid Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first -msgstr Kann nicht zurück in eine Arbeitskopie mit verschiedenen Revisionen integrieren, versuchen Sie erst zu aktualisieren +msgstr Kann nicht in eine Arbeitskopie mit verschiedenen Revisionen zusammenführen [%lu:%lu], versuchen Sie erst zu aktualisieren #: ../libsvn_client/merge.c:8987 ../svn/merge-cmd.c:348 msgid Merge sources must both be either paths or URLs -msgstr +msgstr Zusammenführungsquellen müssen beide Pfade oder URLs sein #: ../libsvn_client/merge.c:9059 ../libsvn_ra/ra_loader.c:539 #, c-format @@ -1955,9 +1952,9 @@ msgid '%s' must be from the same reposi msgstr »%s« muss aus dem selben Projektarchiv wie »%s« stammen #: ../libsvn_client/merge.c:10290 -#, fuzzy, c-format +#, c-format msgid Neither the reintegrate source nor target can be the root of the repository -msgstr »%s« ist nicht die Basis des Projektarchivs +msgstr Weder die Quelle noch das Ziel der Wiedereingliederung darf Wurzel des Projektarchivs sein #: ../libsvn_client/merge.c:10376 #, c-format @@ -2186,13 +2183,12 @@ msgid Svndiff has invalid header msgstr Svndiff-Daten enthalten ungültigen Kopf #: ../libsvn_delta/svndiff.c:744 ../libsvn_delta/svndiff.c:908 -#, fuzzy msgid Svndiff contains a too-large window -msgstr Svndiff-Daten enthalten defektes Fenster +msgstr Svndiff-Daten enthalten ein zu großes Fenster #: ../libsvn_delta/svndiff.c:751 ../libsvn_delta/svndiff.c:915 msgid Svndiff contains corrupt window header -msgstr Svndiff-Daten enthalten defektes Fenster +msgstr Svndiff-Daten enthalten defekte Fenster-Kopfdaten #: ../libsvn_delta/svndiff.c:760 msgid Svndiff has backwards-sliding source views @@ -2209,9
svn commit: r1295312 - in /subversion/branches/1.7.x: ./ subversion/po/de.po
Author: astieger Date: Wed Feb 29 22:09:16 2012 New Revision: 1295312 URL: http://svn.apache.org/viewvc?rev=1295312view=rev Log: Merge r1295303 from trunk (German translation update). Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/subversion/po/de.po Propchange: subversion/branches/1.7.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 29 22:09:16 2012 @@ -78,4 +78,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,115 5404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158923-1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280, 1178282,1178942,1179680,1179767,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,12137 16,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1230714,1231029,1231944-1231945,1232202,1232207,1232221-123,1232413,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1243976,1244303,1244317,1245284-1245285,1245738,1245817,1291429,1291446,1291520,1291680,1291685,1291700,1291704,1291726,1291729,1291941,1292090,1292255,1292507,1292516,1292768,1292827,1292926,1293229,1294470
svn commit: r1295323 - in /subversion/branches/multi-layer-moves/subversion/libsvn_wc: wc-queries.sql wc_db.c
Author: stsp
Date: Wed Feb 29 22:25:08 2012
New Revision: 1295323
URL: http://svn.apache.org/viewvc?rev=1295323view=rev
Log:
On the multi-layer-moves branch, do not preserve move info on BASE nodes.
In the new scheme, BASE nodes do not carry move information.
* subversion/libsvn_wc/wc-queries.sql
(STMT_SELECT_BASE_NODE, STMT_INSERT_NODE): Don't select or set moved_to.
* subversion/libsvn_wc/wc_db.c
(insert_base_node): Stop preserving the moved-to relpath.
Modified:
subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc-queries.sql
subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c
Modified:
subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc-queries.sql?rev=1295323r1=1295322r2=1295323view=diff
==
--- subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc-queries.sql
(original)
+++ subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc-queries.sql
Wed Feb 29 22:25:08 2012
@@ -51,8 +51,7 @@ ORDER BY op_depth DESC
-- STMT_SELECT_BASE_NODE
SELECT repos_id, repos_path, presence, kind, revision, checksum,
translated_size, changed_revision, changed_date, changed_author, depth,
- symlink_target, last_mod_time, properties, file_external IS NOT NULL,
- moved_to
+ symlink_target, last_mod_time, properties, file_external IS NOT NULL
FROM nodes
WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0
@@ -60,7 +59,6 @@ WHERE wc_id = ?1 AND local_relpath = ?2
SELECT nodes.repos_id, nodes.repos_path, presence, kind, revision,
checksum, translated_size, changed_revision, changed_date, changed_author,
depth, symlink_target, last_mod_time, properties, file_external IS NOT NULL,
- moved_to,
/* All the columns until now must match those returned by
STMT_SELECT_BASE_NODE. The implementation of svn_wc__db_base_get_info()
assumes that these columns are followed by the lock information) */
Modified: subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c?rev=1295323r1=1295322r2=1295323view=diff
==
--- subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c
(original)
+++ subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c Wed Feb
29 22:25:08 2012
@@ -782,7 +782,6 @@ insert_base_node(void *baton,
svn_sqlite__stmt_t *stmt;
svn_filesize_t recorded_size = SVN_INVALID_FILESIZE;
apr_int64_t recorded_mod_time;
- const char *moved_to_relpath = NULL;
svn_boolean_t have_row;
/* The directory at the WCROOT has a NULL parent_relpath. Otherwise,
@@ -814,15 +813,13 @@ insert_base_node(void *baton,
recorded_size = get_recorded_size(stmt, 6);
recorded_mod_time = svn_sqlite__column_int64(stmt, 12);
}
- /* Always preserve moved-to info. */
- moved_to_relpath = svn_sqlite__column_text(stmt, 15, scratch_pool);
}
SVN_ERR(svn_sqlite__reset(stmt));
SVN_ERR(svn_sqlite__get_statement(stmt, wcroot-sdb, STMT_INSERT_NODE));
SVN_ERR(svn_sqlite__bindf(stmt, isisisr
tstr /* 8 - 11 */
-isnsss, /* 12 - 21 */
+isns, /* 12 - 19 */
wcroot-wc_id, /* 1 */
local_relpath, /* 2 */
(apr_int64_t)0, /* op_depth is 0 for base */
@@ -838,9 +835,7 @@ insert_base_node(void *baton,
pibb-changed_date, /* 12 */
pibb-changed_author, /* 13 */
(pibb-kind == svn_kind_symlink) ?
-pibb-target : NULL, /* 19 */
-NULL /* 20 */,
-moved_to_relpath /* 21 */));
+pibb-target : NULL)); /* 19 */
if (pibb-kind == svn_kind_file)
{
if (!pibb-checksum
svn commit: r1295372 - /subversion/trunk/subversion/tests/cmdline/externals_tests.py
Author: stsp
Date: Thu Mar 1 01:35:16 2012
New Revision: 1295372
URL: http://svn.apache.org/viewvc?rev=1295372view=rev
Log:
* subversion/tests/cmdline/externals_tests.py
(file_externals_different_url): Extend this test to cover the problem
where 'svn status' used to error out with assertion failed:
repos_id == last_repos_id as reported in various users@ posts
(e.g. http://svn.haxx.se/users/archive-2011-11/0527.shtml).
As of 1.7.3 this is no longer an assertion but an error message
because of r1293813.
Modified:
subversion/trunk/subversion/tests/cmdline/externals_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1295372r1=1295371r2=1295372view=diff
==
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Thu Mar 1
01:35:16 2012
@@ -1916,8 +1916,19 @@ def file_externals_different_url(sbox):
'rr-e-1': Item(status='A '),
})
+ expected_status = actions.get_virginal_state(wc_dir, 1)
+ expected_status.tweak('', status=' M')
+ expected_status.add({
+'r2-e-1': Item(status=' ', wc_rev='1', switched='X'),
+'r1-e-1': Item(status=' ', wc_rev='1', switched='X'),
+'r1-e-2': Item(status=' ', wc_rev='1', switched='X'),
+'rr-e-1': Item(status=' ', wc_rev='1', switched='X'),
+'r2-e-2': Item(status=' ', wc_rev='1', switched='X'),
+ })
+
svntest.actions.run_and_verify_update(wc_dir,
-expected_output, None, None, None)
+expected_output, None,
+expected_status, None)
# Verify that all file external URLs are descendants of r1_url
for e in ['r1-e-1', 'r1-e-2', 'r2-e-1', 'r2-e-2', 'rr-e-1']:
@@ -1934,7 +1945,8 @@ def file_externals_different_url(sbox):
})
svntest.actions.run_and_verify_update(wc_dir,
-expected_output, None, None, None)
+expected_output, None,
+expected_status, None)
# Verify that all file external URLs are descendants of r2_url
for e in ['r1-e-1', 'r1-e-2', 'r2-e-1', 'r2-e-2', 'rr-e-1']:
svn commit: r1295373 - in /subversion/branches/1.7.x-issue4087: ./ subversion/tests/cmdline/externals_tests.py
Author: stsp Date: Thu Mar 1 01:38:42 2012 New Revision: 1295373 URL: http://svn.apache.org/viewvc?rev=1295373view=rev Log: On the 1.7.x-issue4087 branch, merge r1295372 from trunk. Modified: subversion/branches/1.7.x-issue4087/ (props changed) subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/externals_tests.py Propchange: subversion/branches/1.7.x-issue4087/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 1 01:38:42 2012 @@ -76,4 +76,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,115 5404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158923-1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280, 1178282,1178942,1179680,1179767,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1201002,1201072,1201419,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,12152 60,1215288,1215374-1215375,1215379,1220742,1220750,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-123,1232413,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240752,1241530,1241553,1241713,1241726,1242116,1242537,1242607,1243694,1243840,1243920,1244466,1244551
svn commit: r1295374 - /subversion/branches/1.7.x/STATUS
Author: stsp Date: Thu Mar 1 01:42:47 2012 New Revision: 1295374 URL: http://svn.apache.org/viewvc?rev=1295374view=rev Log: * STATUS: Nominate r1295372. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1295374r1=1295373r2=1295374view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Mar 1 01:42:47 2012 @@ -15,7 +15,7 @@ Status of 1.7.4: Candidate changes: == - * r1200277, r1243694, r1243840, r1243920, r1244466, r1244551 + * r1200277, r1243694, r1243840, r1243920, r1244466, r1244551, r1295372 Workaround for issue #4087, bogus repos_id in wc.db for file externals Justification: Regression from 1.6. Some repositories with file externals cannot be @@ -30,6 +30,7 @@ Candidate changes: r1243920 was merged for conflict resolution for r1244466 r1244466 eliminates an unneccesary RA round-trip from r1243694 r1244551 uses a better API to query the local repos root and uuid + r1295372 improves test coverage Votes: +1: stsp
svn commit: r1295403 - in /subversion/branches/1.7.x: ./ subversion/libsvn_wc/ subversion/tests/cmdline/
Author: svn-role Date: Thu Mar 1 04:00:59 2012 New Revision: 1295403 URL: http://svn.apache.org/viewvc?rev=1295403view=rev Log: Reintegrate the 1.7.x-issue4102 branch: * r1233292, r1245711, r1245746, r1245764, r1245809, r1245929, r1245935, r1293577 Fix various problems with symlinks pointing at externals (issue #4102). Justification: Regression from 1.6.x. Users complained: http://svn.haxx.se/users/archive-2012-02/0266.shtml Branch: ^/subversion/branches/1.7.x-issue4102 Votes: +1: stsp, rhuijben, neels Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_wc/adm_ops.c subversion/branches/1.7.x/subversion/libsvn_wc/status.c subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c subversion/branches/1.7.x/subversion/libsvn_wc/wc_db_private.h subversion/branches/1.7.x/subversion/libsvn_wc/wc_db_wcroot.c subversion/branches/1.7.x/subversion/tests/cmdline/special_tests.py Propchange: subversion/branches/1.7.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 1 04:00:59 2012 @@ -9,6 +9,7 @@ /subversion/branches/1.7.x-issue4035-r1185738:1186316-1186778 /subversion/branches/1.7.x-issue4059:1239745-1242661 /subversion/branches/1.7.x-issue4093:1229839-1230236 +/subversion/branches/1.7.x-issue4102:1292401-1295402 /subversion/branches/1.7.x-issue4123:1293358-1293812 /subversion/branches/1.7.x-issue4k:1166502-1167193 /subversion/branches/1.7.x-neon-default:1148803-1158680 @@ -78,4 +79,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,115 5404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158923-1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280, 1178282,1178942,1179680,1179767,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,12137
svn commit: r1295405 - /subversion/branches/1.7.x-issue4102/
Author: svn-role Date: Thu Mar 1 04:01:15 2012 New Revision: 1295405 URL: http://svn.apache.org/viewvc?rev=1295405view=rev Log: Remove the '1.7.x-issue4102' branch, reintegrated in r1295403. Removed: subversion/branches/1.7.x-issue4102/
svn commit: r1295418 - /subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
Author: danielsh
Date: Thu Mar 1 04:54:47 2012
New Revision: 1295418
URL: http://svn.apache.org/viewvc?rev=1295418view=rev
Log:
Commit a helper function I used in r1295187.
(Likely no one noticed this because the test is marked XFail; we
aren't good at verifying that XFail test fail for the right reason.)
* subversion/tests/cmdline/svntest/sandbox.py
(Sandbox.simple_append): New helper.
Modified:
subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
Modified: subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py?rev=1295418r1=1295417r2=1295418view=diff
==
--- subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py Thu Mar 1
04:54:47 2012
@@ -281,6 +281,10 @@ class Sandbox:
self.repo_url + '/' + source,
self.repo_url + '/' + dest)
+ def simple_append(self, dest, contents, truncate=False):
+Append CONTENTS to file DEST, optionally truncating it first.
+open(self.ospath(dest), truncate and 'w' or 'a').write(contents)
+
def is_url(target):
return (target.startswith('^/')
svn commit: r1295425 - /subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c
Author: danielsh
Date: Thu Mar 1 06:28:08 2012
New Revision: 1295425
URL: http://svn.apache.org/viewvc?rev=1295425view=rev
Log:
Add a regression test for issue #4133, 'diff -x -w showing wrong change'.
* subversion/tests/libsvn_diff/diff-diff3-test.c
(test_wrap): New test.
(test_list): Run it, XFail.
Modified:
subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c
Modified: subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c?rev=1295425r1=1295424r2=1295425view=diff
==
--- subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c Thu Mar 1
06:28:08 2012
@@ -2394,7 +2394,37 @@ merge_adjacent_changes(apr_pool_t *pool)
return SVN_NO_ERROR;
}
+/* Issue #4133, 'diff -x -w showing wrong change'. */
+static svn_error_t *
+test_wrap(apr_pool_t *pool)
+{
+ char ldata[(117) + 4+4+3+1];
+ char rdata[(117) + 4+3+3+1];
+ svn_string_t left, right;
+ svn_diff_file_options_t *diff_opts = svn_diff_file_options_create(pool);
+ diff_opts-ignore_space = TRUE;
+ /* Two long lines. */
+ memset(ldata, '@', 117);
+ memset(rdata, '@', 117);
+ strcpy(ldata[117], foo\n ba \n x \n);
+ strcpy(rdata[117], foo\n ba\n x\t\n);
+
+ /* Cast them to svn_string_t. */
+ left.data = ldata;
+ right.data = rdata;
+ left.len = sizeof(ldata)-1;
+ right.len = sizeof(rdata)-1;
+
+ /* Diff them. Modulo whitespace, they are identical. */
+ {
+svn_diff_t *diff;
+SVN_ERR(svn_diff_mem_string_diff(diff, left, right, diff_opts, pool));
+SVN_TEST_ASSERT(FALSE == svn_diff_contains_diffs(diff));
+ }
+
+ return SVN_NO_ERROR;
+}
/* ==
*/
@@ -2425,5 +2455,7 @@ struct svn_test_descriptor_t test_funcs[
3-way merge with conflict styles),
SVN_TEST_PASS2(test_diff4,
4-way merge; see variance-adjusted-patching.html),
+SVN_TEST_XFAIL2(test_wrap,
+ difference at the start of a 128KB window),
SVN_TEST_NULL
};
svn commit: r1295428 - /subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c
Author: danielsh
Date: Thu Mar 1 06:46:21 2012
New Revision: 1295428
URL: http://svn.apache.org/viewvc?rev=1295428view=rev
Log:
* subversion/tests/libsvn_diff/diff-diff3-test.c
(test_wrap): Document the magic number.
Modified:
subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c
Modified: subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c?rev=1295428r1=1295427r2=1295428view=diff
==
--- subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c Thu Mar 1
06:46:21 2012
@@ -2394,7 +2394,10 @@ merge_adjacent_changes(apr_pool_t *pool)
return SVN_NO_ERROR;
}
-/* Issue #4133, 'diff -x -w showing wrong change'. */
+/* Issue #4133, 'diff -x -w showing wrong change'.
+ The magic number used in this test, 117, is
+ CHUNK_SIZE from ../../libsvn_diff/diff_file.c
+ */
static svn_error_t *
test_wrap(apr_pool_t *pool)
{
