Login | Register
My pages Projects Community openCollabNet

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

subclipse
Discussion topic

Back to topic list

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

Author "Cédric Chabanois" <cchabanois at natsys dot fr>
Full name "Cédric Chabanois" <cchabanois at natsys dot fr>
Date 2004-11-08 08:07:42 PST
Message >> 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




--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: dev-unsubscribe@subc​lipse.tigris.org
For additional commands, e-mail: dev-help at subclipse dot tigris dot org

« Previous message in topic | 14 of 15 | Next message in topic »

Messages

Show all messages in topic

Re: Getting to 1.0 - a comparison of features with TortoiseSVN Mark Phippard <MarkP at softlanding dot com> Mark Phippard <MarkP at softlanding dot com> 2004-11-05 17:38:07 PST
     Re: Getting to 1.0 - a comparison of features with TortoiseSVN pkorros Panagiotis Korros 2004-11-07 11:49:15 PST
         Re: Getting to 1.0 - a comparison of features with TortoiseSVN David Corbin <dcorbin at machturtle dot com> David Corbin <dcorbin at machturtle dot com> 2004-11-07 15:26:56 PST
             RE: Getting to 1.0 - a comparison of features with TortoiseSVN Ian Brockbank <Ian dot Brockbank at wolfsonmicro dot com> Ian Brockbank <Ian dot Brockbank at wolfsonmicro dot com> 2004-11-08 02:02:13 PST
                 RE: Getting to 1.0 - a comparison of features with TortoiseSVN Mark Phippard <MarkP at softlanding dot com> Mark Phippard <MarkP at softlanding dot com> 2004-11-08 06:21:55 PST
                     Re: Getting to 1.0 - a comparison of features with TortoiseSVN David Corbin <dcorbin at machturtle dot com> David Corbin <dcorbin at machturtle dot com> 2004-11-09 06:40:31 PST
                         Re: Getting to 1.0 - a comparison of features with TortoiseSVN Mark Phippard <MarkP at softlanding dot com> Mark Phippard <MarkP at softlanding dot com> 2004-11-09 06:45:27 PST
                             Re: Getting to 1.0 - a comparison of features with TortoiseSVN David Corbin <dcorbin at machturtle dot com> David Corbin <dcorbin at machturtle dot com> 2004-11-09 07:13:23 PST
                                 Re: Getting to 1.0 - a comparison of features with TortoiseSVN Mark Phippard <MarkP at softlanding dot com> Mark Phippard <MarkP at softlanding dot com> 2004-11-09 07:17:34 PST
                                     Re: Getting to 1.0 - a comparison of features with TortoiseSVN David Corbin <dcorbin at machturtle dot com> David Corbin <dcorbin at machturtle dot com> 2004-11-09 07:22:45 PST
                                     Re: Getting to 1.0 - a comparison of features with TortoiseSVN Chris Eldredge <chriseldredge at comcast dot net> Chris Eldredge <chriseldredge at comcast dot net> 2004-11-09 07:53:54 PST
                 Re: Getting to 1.0 - a comparison of features with TortoiseSVN cchab chabanois cédric 2004-11-14 14:27:28 PST
         Re: Getting to 1.0 - a comparison of features with TortoiseSVN Mark Phippard <MarkP at softlanding dot com> Mark Phippard <MarkP at softlanding dot com> 2004-11-08 06:18:27 PST
             Re: Getting to 1.0 - a comparison of features with TortoiseSVN "Cédric Chabanois" <cchabanois at natsys dot fr> "Cédric Chabanois" <cchabanois at natsys dot fr> 2004-11-08 08:07:42 PST
                 RE: RE: Getting to 1.0 - a comparison of features with TortoiseSVN Ian Brockbank <Ian dot Brockbank at wolfsonmicro dot com> Ian Brockbank <Ian dot Brockbank at wolfsonmicro dot com> 2004-11-09 02:36:13 PST
Messages per page: