[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Subclipse-users] Problem, when merging RSM Model files

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 1 Feb 2011 15:50:40 -0500

On Tue, Feb 1, 2011 at 8:30 AM, Markus Oberlassnig
<markus.oberlassnig_at_ilogs.at> wrote:

> does sombody know, why the following bug exists with subclipse:
> https://www.ibm.com/developerworks/forums/thread.jspa?threadID=354433&tstart=0
> The problem is the correct merging of RSM Model files (*.emx, *.efx)
> It works with Subversive.

In general, I have heard of people using Subclipse with the
IBM/Rational modeling tools and specifically using the compare/merge

You may or may not want to set an svn:mime-type property to something
like application/xml so that SVN treats the files as binary. This
will prevent SVN from adding merge conflict markers inside the file

As Steve pointed out we support file associations for custom merge
tools. However, they have to be external tools. If the merge program
is Eclipse based I would expect it to "just work". We are just
launching the Eclipse compare framework for diff/merge. It is not a
tool we provide. I would expect custom Eclipse compare/merge tools to
plugin to this framework so that they are invoked automatically.

Mark Phippard
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2011-02-01 21:50:53 CET

This is an archived mail posted to the Subclipse Users mailing list.