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

Merging with subversion

From: Banzi Massimo <massimo.banzi_at_telecomitalia.it>
Date: 2007-04-18 14:11:57 CEST

Hi guys

I have a problem I would like to submit to your attention.

In my Company we are moving from ClearCase to Subversion and met some
difficulties in the overall philosophy of the tool, but mainly in the
way of managing branches and merges.

And I am not talking about merges for concurrent development on a common
branch.

I explain

Developers who need to develop a particular version of a product (with
slightly different features) are used to develop on a parallel branch
(let's call it the customization one) with respect to main development.

When fixes need to be done on the customization branch, developers are
used to merge (with a merge command in CC) fixes to main.

The merging approach of CC is based on the assumption that there exist a
base contributor (the root of the customization branch), and a
contributor on each branch I am merging.

A good feature of CC is that once the merge has been performed, it uses
merge arrows (hyperlinks) to recall of the previous merge. This is used
to change the base contributor in following merges.

I saw a

"svn diff" and "svn merge" sittin' in a tree (
http://subversion.tigris.org/servlets/BrowseList?listName=dev&from=45218
&to=45218&count=31&by=thread&paged=false )

Dev thread which clearly express the ClearCase merge philosophy
developers are used to in my Company, frankly I did'nt understand
whether such a philosophy has been implemented in svn, but apparently
developers say "no" even using Kdiff3 as a merge tool.

Can you help please?

Thanx

Massimo

 

 

--------------------------------------------------------------------

CONFIDENTIALITY NOTICE

This message and its attachments are addressed solely to the persons above and may contain confidential information. If you have received the message in error, be informed that any use of the content hereof is prohibited. Please return it immediately to the sender and delete the message. Should you have any questions, please contact us by replying to webmaster@telecomitalia.it.

        Thank you

                                        www.telecomitalia.it

--------------------------------------------------------------------
                        
Received on Wed Apr 18 14:12:24 2007

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