[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: mergeinfo not inherrited when I thought it should

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Wed, 3 Nov 2010 16:45:19 +0200

Johan Corveleyn wrote on Wed, Nov 03, 2010 at 10:17:34 +0100:
> (the upcoming 1.7 release will improve the situation a bit, IIUC: the
> not-affected-subtrees will no longer have their mergeinfo updated all
> the time, only if they are affected by the merge).

That surprised me a little, but a quick test with current trunk[1]
confirms:

% cd ~/src/svn/16x/
% $svn merge -c N ../trunk
...
% $svn pg -vR svn:mergeinfo . | grep Properties
Properties on '.':
Properties on 'subversion/tests/cmdline/merge_tests.py':
Properties on 'CHANGES':
% $svn st -q
 M .
M subversion/include/svn_client.h
C subversion/tests/cmdline/export_tests.py
C subversion/svn/export-cmd.c
M subversion/libsvn_client/export.c
% $svn st -q | egrep 'CHANGES|merge_tests'
%

Nice.

Daniel

[1] I'm using a build from the performance branch as my "current trunk"
build these days.
Received on 2010-11-03 15:48:08 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.