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

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

From: Mike DeHaan <mikedehaan_at_gmail.com>
Date: 2005-08-05 22:00:34 CEST

Based on these documents, I guess what I'm looking for is a visual
representation of a "Dry Run". The Merge function in eclipse for CVS
did not modify anything in the working copy unless you specifically
said update or manually pull the changes over whereas subclipse
automatically merges.

Are there plans in the works for making a "synchronize-like" view for a Dry Run?


On 8/5/05, Mark Phippard <MarkP@softlanding.com> wrote:
> 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.
> _____________________________________________________________________________
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
> For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Sat Aug 6 06:00:34 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.