[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: Benjamin Fritz <fritzophrenic_at_gmail.com>
Date: Wed, 6 Aug 2014 12:21:39 -0500

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
Received on 2014-08-06 19:22:26 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.