On Wed, Aug 6, 2014 at 1:00 PM, Stefan Sperling wrote:
> 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
> t
On Wed, Aug 06, 2014 at 12:21:39PM -0500, Benjamin Fritz wrote:
> On Wed, Aug 6, 2014 at 12:14 PM, Andreas Stieger
> 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 c
On Wed, Aug 6, 2014 at 12:14 PM, Andreas Stieger 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
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
Andreas
> On 6 Aug 2014, at 18:04, Benjamin Fritz wrote:
>
> I accidentally created a
I accidentally created a "host" directory both on a feature branch,
and on trunk. On trunk, this directory contains a "lib" subdirectory
containing a project to build a Windows version of the library I'm
developing. On the feature branch, this directory instead contains a
"test" directory containin
