[Subclipse-users] Merge/reintegrate issue with 1.8.1

I'm using the latest versions of Eclipse and Subclipse, on Mac OS X, with JavaHL and Subversion 1.8.1.

I have a project with a trunk and a branch. I just merged from trunk into the branch.

Now I'm trying to use Subclipse to merge from the branch back into trunk, i.e. what used to be called a reintegrate merge. I end up getting a bunch of conflicts, which I shouldn't get on a reintegrate. The output looks like this:

merge svn+ssh://server/project/branches/branch /workspace/project_trunk
    --- Merging r128641 through r139469 into /workspace/project_trunk
      C /workspace/project_trunk/file
[...]

If I do this on the command line, it works, with no conflicts:

$ svn co svn+ssh://server/project/trunk /workspace/project_trunk2
$ svn merge svn+ssh://server/project/branches/branch /workspace/project_trunk2
--- Merging differences between repository URLs into 'project_trunk2':
[...]
--- Recording mergeinfo for merge between repository URLs into 'project_trunk2':
 G project_trunk2

Is there any reason Subclipse would be doing the merge differently than the command line?

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

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