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

Re: Directory with tree conflict lies about merge result

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 6 Aug 2014 20:00:42 +0200

On Wed, Aug 06, 2014 at 12:21:39PM -0500, Benjamin Fritz wrote:
> On Wed, Aug 6, 2014 at 12:14 PM, Andreas Stieger <andreas.stieger_at_gmx.de> wrote:
> > Hello,
> >
> > I recommend the following:
> > In a clean working copy of the feature branch...
> > svn mv host host_branch
> > Then perform the merge, now without tree conflict.
> > svn mv host_branch/test host/
> > svn rm host_branch
> >
> Thanks! That got me around my immediate problem.
> But why does "svn merge" output misleading status, saying that it
> added files and folders that never actually get added to the working
> copy?

The server keeps sending adds for the paths.
It has no idea the client cannot use them.

Note how the As you're asking about appear in the tree-conflict column,
not in the first column as normal adds do. They allow you to see what
the server wants to add beneath its version of 'host'.

C:\Project_Files\FEATURE_WC>svn merge -c 6891 http://example.com/SVN/lib/trunk
--- Merging r6891 into '.':
 U externals
A lib\win32
A lib\win32\lib.lib
A lib\win32\lib.d.lib
   C host
   A host\lib\lib.sln
   A host\lib\proj\lib.vcxproj
   A host\lib\proj\lib.vcxproj.filters
   A host\lib\proj\lib.vcxproj.user
   A host\lib\proj
   A host\lib
Received on 2014-08-06 20:01:18 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.