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

RE: [Subclipse-users] External Diff/Merge doesn't seem to work

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-08-08 16:44:38 CEST

"Marc Batchelor" <mbatchelor@pentaho.org> wrote on 08/08/2006 10:35:58 AM:

> Sorry to be a pain, but even after the conflict is detected (in Team
> Synchronize), the Edit Conflicts menu option is never enabled.
> I've tried various things, but no dice. No matter what I do, I cannot
> the Edit Conflicts to be enabled. Under the synchronize, the file is
> indicated as a merge conflict (and shows up as the only file when
> Mode is entered), but the menu item is never enabled. Oddly, neither is
> "Mark Resolved" (which I would also expect to be). However, "Mark as
> is enabled.

It has to be a Subversion conflict. The Synchronize view conflicts just
mean you have both a local (outgoing) and repository (incoming) change to
the same resource. However, it is still possible, even likely, that a
Subversion update will auto-merge the changes, It is only when Subversion
cannot auto-merge the changes, and thus produces a local Subversion
conflict, that you can do Edit Conflicts.

You could also get Subversion conflicts by running the Team -> Merge


I do not know if we could realistically integrate a 3rd party tool into
those other areas that bring up editors. Often, the inputs to that
process are not local files. Those editors are operating on streams that
we provide. We would have to enhance our process to download and create
the files in some local temp area in order to be able to provide them to
the editors.

The Edit Conflicts action can use an external editor because Subversion
has produced local copies of all of the files involved in the conflict, as
is explained in the above link.


To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Tue Aug 8 16:45:21 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.