|Subversive does not detect tree conflict [message #1012933]
||Fri, 22 February 2013 13:35
| Romain Chantereau
Registered: February 2013
I have the following error on the working copy status :|
> local add, incoming add upon merge
But, subversive does not show any conflict in the project navigator, the synchronization view (at merge integration & at project synchronisation) and of course "edit tree conflict" does not have any effect.
A "svn st" reports me the conflict.
I used SVNkit and JavaHL : same behaviour.
I am using svn 1.6.x as client on a svn 1.4.x server but there is no reason that the sever version have an impact on this client managed issue.
Does anyone had the same issue or know how to work around ?
[Updated on: Fri, 22 February 2013 15:33]
Report message to a moderator
Powered by FUDForum
. Page generated in 0.01837 seconds