Another notification regression from 1.7. Reintegrate-style automatic merges
produce a '--- Merging differences between repository URLs into' notification
for every path touched by the merge:
1.8-dev>svn merge ^^/subversion/branches/windows-build-update . --reintegrate
--- Merging differences between repository URLs into '.':
A BRANCH-README
--- Merging differences between repository URLs into '.':
U subversion\libsvn_subr\prompt.c
--- Merging differences between repository URLs into '.':
U subversion\tests\libsvn_wc\op-depth-test.c
--- Merging differences between repository URLs into '.':
U subversion\tests\libsvn_repos\repos-test.c
--- Merging differences between repository URLs into '.':
U subversion\tests\cmdline\svnadmin_tests.py
--- Merging differences between repository URLs into '.':
U subversion\tests\cmdline\upgrade_tests.py
--- Merging differences between repository URLs into '.':
U subversion\tests\cmdline\update_tests.py
--- Merging differences between repository URLs into '.':
U subversion\tests\cmdline\svntest\actions.py
--- Merging differences between repository URLs into '.':
U subversion\tests\cmdline\merge_tests.py
--- Merging differences between repository URLs into '.':
U subversion\tests\cmdline\merge_reintegrate_tests.py
--- Merging differences between repository URLs into '.':
U subversion\svn\merge-cmd.c
--- Merging differences between repository URLs into '.':
U subversion\svn\conflict-callbacks.c
--- Merging differences between repository URLs into '.':
U subversion\include\svn_repos.h
--- Merging differences between repository URLs into '.':
U subversion\include\svn_wc.h
--- Merging differences between repository URLs into '.':
U subversion\include\svn_client.h
--- Merging differences between repository URLs into '.':
U subversion\include\private\svn_wc_private.h
--- Merging differences between repository URLs into '.':
U subversion\libsvn_wc\diff_editor.c
--- Merging differences between repository URLs into '.':
U subversion\libsvn_wc\conflicts.c
--- Merging differences between repository URLs into '.':
U subversion\libsvn_wc\update_editor.c
--- Merging differences between repository URLs into '.':
U subversion\libsvn_wc\conflicts.h
--- Merging differences between repository URLs into '.':
U subversion\libsvn_wc\wc-queries.sql
--- Merging differences between repository URLs into '.':
U subversion\libsvn_wc\wc_db_update_move.c
--- Merging differences between repository URLs into '.':
U subversion\libsvn_wc\wc_db.c
--- Merging differences between repository URLs into '.':
U subversion\libsvn_client\repos_diff.c
--- Merging differences between repository URLs into '.':
U subversion\libsvn_client\client.h
--- Merging differences between repository URLs into '.':
U subversion\libsvn_client\merge.c
--- Merging differences between repository URLs into '.':
U subversion\libsvn_client\diff.c
--- Merging differences between repository URLs into '.':
U subversion\libsvn_ra_serf\update.c
--- Merging differences between repository URLs into '.':
U subversion\libsvn_repos\authz.c
--- Merging differences between repository URLs into '.':
A build\generator\gen_win_packaged_deps.py
--- Merging differences between repository URLs into '.':
A build\generator\gen_vcnet_vcproj_packaged_deps.py
--- Merging differences between repository URLs into '.':
U gen-make.py
--- Merging differences between repository URLs into '.':
U .
--- Recording mergeinfo for merge between repository URLs into '.':
U .
Here's a 1.7 client for comparison:
1.7.9-dev>svn merge
https://svn.apache.org/repos/asf/subversion/branches/windows-build-update .
--reintegrate
--- Merging differences between repository URLs into '.':
U Makefile.in
U build.conf
U win-tests.py
U COMMITTERS
A BRANCH-README
U subversion\mod_authz_svn\mod_authz_svn.c
U subversion\mod_authz_svn\INSTALL
U subversion\libsvn_diff\diff_memory.c
U subversion\libsvn_diff\diff_file.c
A subversion\libsvn_diff\diff_tree.c
U subversion\libsvn_subr\io.c
U subversion\libsvn_subr\prompt.c
U subversion\tests\libsvn_diff\diff-diff3-test.c
U subversion\tests\libsvn_wc\op-depth-test.c
U subversion\tests\libsvn_client\client-test.c
U subversion\tests\libsvn_repos\repos-test.c
U subversion\tests\cmdline\svnadmin_tests.py
A subversion\tests\cmdline\svnauthz_tests.py
U subversion\tests\cmdline\upgrade_tests.py
U subversion\tests\cmdline\update_tests.py
U subversion\tests\cmdline\entries-dump.c
U subversion\tests\cmdline\svntest\wc.py
U subversion\tests\cmdline\svntest\sandbox.py
U subversion\tests\cmdline\svntest\actions.py
U subversion\tests\cmdline\svntest\main.py
U subversion\tests\cmdline\svntest\verify.py
U subversion\tests\cmdline\merge_tests.py
U subversion\tests\cmdline\patch_tests.py
U subversion\tests\cmdline\lock_tests.py
U subversion\tests\cmdline\switch_tests.py
U subversion\tests\cmdline\copy_tests.py
U subversion\tests\cmdline\merge_reintegrate_tests.py
U subversion\tests\cmdline\authz_tests.py
U subversion\tests\svn_test_fs.c
U subversion\svn\merge-cmd.c
U subversion\svn\cl.h
U subversion\svn\mergeinfo-cmd.c
U subversion\svn\resolved-cmd.c
U subversion\svn\svn.c
U subversion\svn\notify.c
U subversion\svn\conflict-callbacks.c
U subversion\svn\resolve-cmd.c
U subversion\include\svn_repos.h
U subversion\include\svn_config.h
U subversion\include\svn_wc.h
U subversion\include\svn_client.h
A subversion\include\private\svn_diff_tree.h
U subversion\include\private\svn_wc_private.h
U subversion\include\private\svn_client_private.h
U subversion\libsvn_wc\props.h
U subversion\libsvn_wc\diff_editor.c
U subversion\libsvn_wc\adm_ops.c
U subversion\libsvn_wc\status.c
U subversion\libsvn_wc\conflicts.c
U subversion\libsvn_wc\update_editor.c
U subversion\libsvn_wc\conflicts.h
U subversion\libsvn_wc\wc-queries.sql
U subversion\libsvn_wc\wc_db_update_move.c
U subversion\libsvn_wc\wc_db.c
U subversion\libsvn_client\deprecated.c
U subversion\libsvn_client\diff_summarize.c
U subversion\libsvn_client\repos_diff.c
U subversion\libsvn_client\client.h
U subversion\libsvn_client\merge.c
U subversion\libsvn_client\patch.c
U subversion\libsvn_client\diff.c
U subversion\libsvn_client\copy.c
U subversion\libsvn_client\blame.c
U subversion\libsvn_client\copy_foreign.c
U subversion\libsvn_ra_serf\update.c
U subversion\libsvn_repos\deprecated.c
U subversion\libsvn_repos\repos.c
U subversion\libsvn_repos\authz.c
U subversion\libsvn_repos\repos.h
U subversion\svnserve\serve.c
U subversion\svnserve\svnserve.c
A build\generator\gen_win_packaged_deps.py
A build\generator\gen_vcnet_vcproj_packaged_deps.py
U build\generator\gen_win.py
U tools\server-side\svnauthz.c
U configure.ac
U gen-make.py
U .
--- Recording mergeinfo for merge between repository URLs into '.':
U .
Bug
Major