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

Re: Getting to 1.0 - a comparison of features with TortoiseSVN

From: CÚdric Chabanois <cchabanois_at_natsys.fr>
Date: 2004-11-08 17:07:42 CET

>> Some comments on this discussion
>>
>> 1. Conflict Editor
>> Eclipse already has a compare/conflict editor. The editor we use to
>> compare with BASE or remote can be made to work as a three way editor
>> (like the cvs plugin) comparing local with remote using a common
>> ancestor (BASE).
>
> This could be used in the synch view, but if I just do an update and a
> conflict is created in my working copy, could it be used then? I still
> like the idea of adding a preference to launch an external program. As I
> said, there could be a default of "built-in" once we have a way to do this
> within Eclipse.

I added the possibility to launch an external program for conflicts
resolution last week-end.
I will now do the built-in stuff

CÚdric
Received on Tue Nov 9 03:07:42 2004

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