On Wed, May 22, 2013 at 11:39:25PM -0000, danie...@apache.org wrote: > Author: danielsh > Date: Wed May 22 23:39:25 2013 > New Revision: 1485506 > > URL: http://svn.apache.org/r1485506 > Log: > * CHANGES (1.6.x): Re-do r1485501 from trunk, minus the 1.7.10 part. > > Modified: > subversion/branches/1.6.x/CHANGES >
r1485501 touches both the 1.6.23 and 1.7.10 sections, so it would conflict if merged. So I didn't merge it, instead, I applied the change by hand. When I tried to record-only merge that revision (to a pristine 1.6.x working copy, using an 1.8.0-rc2 client), I got mergeinfo changes on numerous files in the tree. Transcript attached. I would have expected only ./CHANGES to have property modifications, not any other file in the tree. Is there a bug in the behaviour recorded in the transcript? Thanks Daniel > Modified: subversion/branches/1.6.x/CHANGES > URL: > http://svn.apache.org/viewvc/subversion/branches/1.6.x/CHANGES?rev=1485506&r1=1485505&r2=1485506&view=diff > ============================================================================== > --- subversion/branches/1.6.x/CHANGES (original) > +++ subversion/branches/1.6.x/CHANGES Wed May 22 23:39:25 2013 > @@ -4,7 +4,7 @@ http://svn.apache.org/repos/asf/subversi > > User-visible changes > - Server-side bugfixes: > - * fix repository corruption due to newline in filename (issue #4340) > + * fix FSFS repository corruption due to newline in filename (issue #4340) > * fix svnserve exiting when a client connection is aborted (r1482759) > > - Other tool improvements and bugfixes: > >
svn-qavm,0:svn/16x% svn --version -q 1.8.0-rc2 svn-qavm,0:svn/16x% svnversion 1485503 svn-qavm,0:svn/16x% svn merge -c r1485501 --record-only ^/subversion/trunk --- Recording mergeinfo for merge of r1485501 into '.': U . --- Recording mergeinfo for merge of r1485501 into 'CHANGES': U CHANGES --- Recording mergeinfo for merge of r1485501 into 'contrib/client-side/emacs/psvn.el': U contrib/client-side/emacs/psvn.el --- Recording mergeinfo for merge of r1485501 into 'get-deps.sh': U get-deps.sh --- Recording mergeinfo for merge of r1485501 into 'subversion/bindings/ctypes-python/setup.py': U subversion/bindings/ctypes-python/setup.py --- Recording mergeinfo for merge of r1485501 into 'subversion/include/private/svn_repos_private.h': U subversion/include/private/svn_repos_private.h --- Recording mergeinfo for merge of r1485501 into 'subversion/libsvn_fs_fs/rep-cache.c': U subversion/libsvn_fs_fs/rep-cache.c --- Recording mergeinfo for merge of r1485501 into 'subversion/libsvn_repos/repos.c': U subversion/libsvn_repos/repos.c --- Recording mergeinfo for merge of r1485501 into 'subversion/svn/svn.1': U subversion/svn/svn.1 --- Recording mergeinfo for merge of r1485501 into 'subversion/svnadmin/svnadmin.1': U subversion/svnadmin/svnadmin.1 --- Recording mergeinfo for merge of r1485501 into 'subversion/svndumpfilter/svndumpfilter.1': U subversion/svndumpfilter/svndumpfilter.1 --- Recording mergeinfo for merge of r1485501 into 'subversion/svnlook/svnlook.1': U subversion/svnlook/svnlook.1 --- Recording mergeinfo for merge of r1485501 into 'subversion/svnserve/main.c': U subversion/svnserve/main.c --- Recording mergeinfo for merge of r1485501 into 'subversion/svnsync/svnsync.1': U subversion/svnsync/svnsync.1 --- Recording mergeinfo for merge of r1485501 into 'subversion/svnversion/svnversion.1': U subversion/svnversion/svnversion.1 --- Recording mergeinfo for merge of r1485501 into 'subversion/tests/cmdline/merge_tests.py': U subversion/tests/cmdline/merge_tests.py --- Recording mergeinfo for merge of r1485501 into 'subversion/tests/cmdline/svntest/main.py': U subversion/tests/cmdline/svntest/main.py svn-qavm,0:svn/16x% svn st -q M . M CHANGES M contrib/client-side/emacs/psvn.el M get-deps.sh M subversion/bindings/ctypes-python/setup.py M subversion/include/private/svn_repos_private.h M subversion/libsvn_fs_fs/rep-cache.c M subversion/libsvn_repos/repos.c M subversion/svn/svn.1 M subversion/svnadmin/svnadmin.1 M subversion/svndumpfilter/svndumpfilter.1 M subversion/svnlook/svnlook.1 M subversion/svnserve/main.c M subversion/svnsync/svnsync.1 M subversion/svnversion/svnversion.1 M subversion/tests/cmdline/merge_tests.py M subversion/tests/cmdline/svntest/main.py svn-qavm,0:svn/16x%
