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

Re: Tortoise synchronize like Subclipse

From: Sven Probst <sven.probst_at_ilt.fraunhofer.de>
Date: 2007-08-10 16:35:56 CEST

Lasse Vågsæther Karlsen schrieb:
> On 8/10/07, *Daniele* <sdaniele78@tiscalinet.it
> <mailto:sdaniele78@tiscalinet.it>> wrote:
>
> Hi.
> I use Tortoise usually, but Subclipse for Java.
> So, in Tortoise there isn't a fantastic feature (or, I don't know
> it) to
> view and merge file.
> If I do update, Tortoise do automatic merge.
> If I use "Check for modification", I can see only my difference
> from HEAD.
> To view difference of all users, I need to use "Show difference as
> unified diff" , or create and apply Patch.
> With Subclipse I can use "synchronize with repository" and
> graphically I
> can merge file and then set it merged.
> I hope in this feature for Tortoise.
>
>
>
> Is there a problem with the automatic merge that Subversion uses when
> there isn't a conflict?
>
> --
> Lasse Vågsæther Karlsen
> mailto: lasse@vkarlsen.no <mailto:lasse@vkarlsen.no>
After an automatic merge you not necessarily get valid programme code.
Therefore I'd prefer the above mentioned behaviour, too.

Sven.

-- 
----------------------------------------------------------
# Dipl.-Ing. Sven Probst
# Fraunhofer-Institut für Lasertechnik
# Steinbachstr. 15, D-52074 Aachen, Germany.
# Tel   : + 49 (0) 241 8906 314
# Fax   : + 49 (0) 241 8906 121
# EMail : sven.probst@ilt.fraunhofer.de
# WWW   : <http://www.ilt.fraunhofer.de>
Received on Fri Aug 10 16:33:58 2007

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