Re: Re: Re: Merge/reintegrate issue with 1.8.1

On Tue, Aug 27, 2013 at 7:37 PM, Jacob Weber <[email protected]> wrote:

> 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.
>

To answer your other question, I do not think there is anything else you
can try.  We just need to dig deeper to see if this is a bug we need to
report or something we can correct in calling the API.

FWIW, we do not tell it to do a certain type of merge.  We just call the
merge API with the URL you want to merge and everything else happens inside
of the Subversion API.  It is possible there is a bug in JavaHL that it is
not properly hooking up with the new API, or perhaps the required arguments
for the API have changed and we need to pass a different value in one of
the arguments.

-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

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

To unsubscribe from this discussion, e-mail: [[email protected]].