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

Re: Subversion vs. Clear Case

From: Dirk Schenkewitz <schenkewitz_at_docomolab-euro.com>
Date: 2005-07-06 11:18:12 CEST

David Weintraub wrote:
> ...
> Again, in ClearCase, there is no fear of merging since it goes so
> smoothly, and this is something that Subversion needs to learn from
> ClearCase.

You can either let CC make a trial to merge all by itself and report
those files where it found conflicts or you can do the merging all
by yourself. Then you get a nice graphical presentation of the files
and can move lines from here to there.

AFAIR, it is some years ago that I worked with CC.

Btw, I found 'meld' (http://meld.sourceforge.net/) to be very con-
venient for hand-merging. Just a side note, I have no experience
with merging with subversion up to now.

Dirk

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jul 6 11:25:39 2005

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