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

I tried this with a different project, and got the same results. Conflicts when I merge using Subclipse, and none when I run the exact same command using the command-line svn client (copied and pasted from the SVN Console).

I noticed that on the command line, when I do a sync merge, it says something like "Merging r100 through r200 into 'project'". But when I do a reintegrate merge, it says "Merging differences between repository URLs into 'project'".

In Subclipse, when I do what should be a reintegrate merge, I get the first message: "Merging r100 through r200 into 'project'". So that makes me think it's trying to do a sync merge instead.

> On Tue, Aug 27, 2013 at 4:45 PM, Jacob Weber <jacob at jacobweber dot com> wrote:
>
> > 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.
> >
>
> The server version does not matter.
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2013-08-28 01:37:25 CEST