[news.eclipse.technology.epf] Re: Experience with Subversion?

[Jan Masaryk <jan.masaryk@xxxxxxxxx>]

Hi Gerhard,

we use it with svn as well. we needed intuitive and easy VCS with atomic 
changes over model and cheap branching/tagging.

important to know is that SVN is a optimistic VCS, which means that 
naturally no locking mechanism are applied over repository and SVN try 
merge automatically.
therefore problem is in changing reference files of model (what are: 
plugin.xmi and library.xmi). especially plugin.xmi can be change quit 
often. we try prevent problem in this place with combination of rules:
 1. commit often - even when requirement is not fullfilled
 2. inspired with this guideline 
http://www.ibm.com/developerworks/rational/library/feb07/peraire/index.html
 we have one person responsible to prepare model sketch (which contains 
method atributes changed in plugin.xmi)
 3. one person is responsible for solving merge conflict (the same as 
preparing model sketch)

concerning point 1. we use branching and tagging. we have 2 branches:
 - trunk (stabile) which contains version ready to publish
 - modeling branch - which contains preparing version which is after 
review merged to trunk

definitelly SVN is better choise as cvs. :-)

all the best,
jan masaryk



Gerhard Schneider wrote:
> Is there anybody out there who is managing EPF models with Subversion? 
> (i.e., NOT with config mgmt tools using check-in/check-out mechanisms)
>
> Beside general exchange of thoughts, I'd especially be interested in the 
> question if there is experience with potential model inconsistencies in 
> case multiple people are working in parallel on model elements, merging 
> the changes afterwards via SVN.
>
> Are there good practices that should be used with SVN?
>
> I'd be willing to collect the feedback and to prepare a paper from it.
>
> Best regards,
> Gerhard