RE: Re: [Subclipse-users] Merge/reintegrate issue with 1.8.1

Yep, Subclipse 1.10.1, and CollabNet Merge Client 4.0.1.

I'm checking out and merging from the same branches in both examples.

The only difference is that I checked out separate working copies of trunk using the command line and Subclipse, so I could test both.

I also tried running the command-line merge on the working copy that I checked out using Subclipse. The merge still works on the command-line.

I remember having this problem with SVN 1.8.0, even on the command-line. But 1.8.1 fixed it, and Subclipse is using the 1.8.1 version of JavaHL, according to the preferences page.

FYI, the server is still 1.7.x, if that matters.

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3063425

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2013-08-27 22:45:24 CEST