Eclipse Community Forums: Subversive » Subversive does not detect tree conflict

Home » Eclipse Projects » Subversive » Subversive does not detect tree conflict(tree conflict detection 1.6.x client 1.4.x server )

Show: Today's Messages :: Show Polls :: Message Navigator

Subversive does not detect tree conflict [message #1012933]

Fri, 22 February 2013 08:35

Romain Chantereau
Messages: 2
Registered: February 2013

Junior Member

I have the following error on the working copy status :
C directory
> 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 10:33]

Report message to a moderator

Re: Subversive does not detect tree conflict [message #1012937 is a reply to message #1012933]

Fri, 22 February 2013 08:46

Romain Chantereau
Messages: 2
Registered: February 2013

Junior Member

I forgot a precision : when I do a merge preview : the tree conflict is detected in the preview text. Of course, after merge action, no more information on it.

[Updated on: Fri, 22 February 2013 08:47]

Report message to a moderator

Re: Subversive does not detect tree conflict [message #1019265 is a reply to message #1012933]

Fri, 15 March 2013 06:39

John Elliott
Messages: 1
Registered: March 2013

Junior Member

I have the same problem

Server 1.6, client 1.6

Juno

I ended up using CLI

Report message to a moderator

Previous Topic:	SVNKit Access
Next Topic:	How to commit an outdated version of a file

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Tue Oct 08 01:01:28 EDT 2013