Re: CVS Merge vs SVN Merge - A newbie's story

Mike DeHaan <mikedehaan@gmail.com> wrote on 08/05/2005 02:57:01 PM:

> I've been using CVS now for quite some time and am recently
> considering switching to SVN. Currently there are a few issues
> standing in my way that hopefully someone will be able to make clear.
>
> My main issue is dealing with Subclipse's merge functionality. With
> CVS, a merge will pull up a view that looks much like a synchronize
> window (allowing me to pick and choose the changes I want merged).
> When I do a merge with subclipse, I don't get the window. Subclipse
> seems to do the merge as best it knows how, without my intervention.
>
> Am I mistaken in this behaviour? Is there a way to get a "CVS-style"
merge?
>
> Subversion 1.2.1
> Eclipse 3.0.2
> Subclipse 0.9.32

Subversion handles merging differently than CVS. I would suggest reading
the chapter on merging in the Subversion book.

http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html

Also, the Subclipse UI for merge is very similar to TortoiseSVN. Read
their help for the merge UI.

http://tortoisesvn.sourceforge.net/docs/release/TortoiseSVN_en/ch05s17.html

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Sat Aug 6 05:13:29 2005