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
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 '.':
Received on 2014-08-06 20:01:18 CEST