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

Re: mergeinfo marked not inheritable on sparse checkout

From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Wed, 19 Oct 2011 09:29:21 +0200

On Wed, Oct 19, 2011 at 1:44 AM, Douglas Wilson
<douglasg.wilson_at_gmail.com> wrote:
> If I have a sparse checkout of /trunk (say it has subdirectories dir1
> and dir2, so I just have a working copy of /trunk/dir1), commit some
> changes, switch my checkout to a branch, then try to merge the changes
> I just committed, the mergeinfo property gets revisions marked with
> "*" in the branch root, and updates mergeinfo in the directory with
> the changes.
>
> Is there any reason the merge has to have the "*", since there were no
> changes outside of my working copy?

Is this still the case with 1.7? Could you test that?

There were a lot of merge-tracking improvements and bugfixes in 1.7,
but I'm not sure if this particular issue has been addressed. See
http://subversion.apache.org/docs/release-notes/1.7.html#merge-tracking-enhancements.

-- 
Johan
Received on 2011-10-19 09:30:16 CEST

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.