I read quite a few SO threads on this, as well as the following blogg , but still don't understand my specific problem, so I hope someone can help ...
Merging from mainline to dev string to catch up again, and I get the following tree conflict.
M incubator
C incubator/UtilityScripts
> local dir obstruction, incoming dir add upon merge
Ok, so I understand that it should be that this directory was independently added to both the trunk and the dev branch independently, so there is no common ancestor ...
.. Buuuut (always there, but right ?!), there is a common ancestor. This directory came into my dev branch due to a previous merge with the truck.
dev$ svn mergeinfo {^/trunk/src/,}incubator/UtilityScripts/
youngest common ancestor
| last full merge
| | tip of branch
| | | repository path
23788 23838
| |
-------| |------------ trunk/src/incubator/UtilityScripts
\
\
--| |------------ branches/dev/src/incubator/UtilityScripts
|
23838
So, as far as I understand, SVN really believes that the dev branch is connected to the base with a common ancestor in revision 23788.
branch$ svn log --stop-on-copy incubator/UtilityScripts/
------------------------------------------------------------------------
r23790 | me | 2015-05-12 16:08:25 +0100 (Tue, 12 May 2015) | 1 line
, 23790, 23838
Trunk$ svn log --stop-on-copy incubator/UtilityScripts/
------------------------------------------------------------------------
r23639 | someone | 2015-03-06 10:59:10 +0000 (Fri, 06 Mar 2015) | 1 line
, 23788. , dev 23790, . - 23639, .
, , ?!