[kepler-dev] SVN or GIT

[David Welker]

It may be true that merges in Ptolemy are relatively simple. But for 
Kepler where the work may be more distributed, merging is likely to be 
an issue more often for reasons not having to do with developer laziness.

In any case, I think we can have the best of both worlds. With git-svn 
you can use git to do the merge in cases where it is non-trivial. 
(However, if you don't want to use it, you can just use vanilla SVN. 
svn-git would be an option, not a requirement. In fact, if someone used 
svn-git instead of vanilla SVN to merge the code, no one else need even 
be the wiser... we are not talking about using git for SCM, we are 
talking about using pure svn, but maybe using git-svn as a merging tool 
when and if convenient...). That way, we can continue to use eclipse, 
Netbeans, Intellij or whatever to interact with the SCM, but merging 
entire branches when necessary is a little less painful. Think of it as 
a utopia where people who are lazy and people who are diligent both get 
what they want. =)

-David
> In my experience, complicated merges come about mostly because people
> are too lazy to keep their work synchronized... Why should we
> penalize the more effective developers for the benefit of the
> sloppy ones?
>
> Edward
>
>
> At 06:00 PM 5/24/2008, David Welker wrote:
>   
>> This sounds reasonable to me.
>>
>> It seems that going with SVN might be better at this point.
>>
>> Where does git shine? It shines in its ability to merge. Most merges  
>> are trivial, and perfectly easy to do with SVN.
>>
>> For those merges that are more complicated (for example, the merging  
>> of two branches that have been separated by a significant amount of  
>> time) you can use git-svn. That allows you to use git to merge  
>> branches stored in SVN repositories.
>>
>> Also, it is not to hard to migrate from SVN to git if we decide we  
>> would like to do this later. For now, I would advocate sticking to  
>> SVN...
>>
>> -David
>>
>> On May 24, 2008, at 5:41 PM, Edward A. Lee wrote:
>>
>>     
>>> At 12:36 PM 5/24/2008, David Welker wrote:
>>>       
>>>> How hard is Git to use from the command line? Would it be  
>>>> unreasonable
>>>> to have people switch to the command line to checkout and commit?
>>>>         
>>> I would be opposed to this.
>>>
>>> In Eclipse, I routinely review checkins in key packages
>>> of Ptolemy II.  The diff mechanism of Eclipse is essential
>>> for this.  I don't groc command-line diffs...
>>>
>>> So losing this capability would result in reduced quality
>>> in the core of Ptolemy II, since if I can't easily check
>>> the checkins, I won't...
>>>
>>> Edward
>>>
>>>
>>>
>>> ------------
>>> Edward A. Lee
>>> Chair of EECS and Robert S. Pepper Distinguished Professor
>>> 231 Cory Hall, UC Berkeley, Berkeley, CA 94720-1770
>>> phone: 510-642-0253, fax: 510-642-2845
>>> eal at eecs.Berkeley.EDU, http://www.eecs.berkeley.edu/Faculty/Homepages/lee.html
>>>       
>
> ------------ 
> Edward A. Lee
> Chair of EECS and Robert S. Pepper Distinguished Professor
> 231 Cory Hall, UC Berkeley, Berkeley, CA 94720-1770
> phone: 510-642-0253, fax: 510-642-2845
> eal at eecs.Berkeley.EDU, http://www.eecs.berkeley.edu/Faculty/Homepages/lee.html  
>
>
>