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

Re: How well does branch merge work?

From: Mark Phippard <markp_at_softlanding.com>
Date: 2005-11-10 04:10:25 CET

Merge is really a Subversion function. Subclipse just has to fire off the
Subversion API with the parms you provide and it does the rest. I
personally find it works really well and I do this on an almost daily basis
for several different projects. Subversion typically auto-merges all of
the changes, it produces conflicts for all of the ones it cannot auto merge
and you can then use the Edit Conflict option to resolve the merge using
the Eclipse 3-way compare. Use the Mark Resolved option when you are done.

Subclipse also creates problem markers in Eclipse for all of the conflicts,
which I personally like because then you can just work from the Problems
view and use Quick Fix.

The main issue with merging is that you need to track what revisions you
have merged yourself using comments. If you are just tracking another
branch/trunk this is actually pretty easy. Just enter in the comments when
you commit the results of the merge the last revision number that you
merged. Something like:

Merge r3810:4015 from trunk.

Then the next time you merge you know to enter 4015 as the From Revision.


Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
Received on Thu Nov 10 14:10:25 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.