openjpa-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Patrick Linskey <plins...@gmail.com>
Subject Re: [OT] git and Apache's svn?
Date Tue, 09 Dec 2008 16:00:52 GMT
> Kevin's "build levels" idea sounds similar to a sandbox. Git makes  
> merging
> changes easy (or so I'm told) so sandboxes would also be easier to  
> use.

Git absolutely trivializes merging.

> I'm not sure it's worth the additional point of failure for day to  
> day work
> though.

It definitely makes things a bit more complex, sometimes needlessly,  
but it enables some pretty different modes of development.

-Patrick

On Dec 9, 2008, at 7:31 AM, Michael Dick wrote:

> Hi,
>
> Just adding my $0.02
>
> I stumbled across an infrastructure page on git a while back. From  
> what I
> remember you can register your project to be "mirrored" to git. We  
> would be
> able to check out changes using git, but commits would be done with  
> SVN
> (similar to what Mark said).
>
> Kevin's "build levels" idea sounds similar to a sandbox. Git makes  
> merging
> changes easy (or so I'm told) so sandboxes would also be easier to  
> use. I'm
> not sure it's worth the additional point of failure for day to day  
> work
> though.
>
> I'm not an expert on git though so maybe I'm missing something,
>
> -mike
>
> On Tue, Dec 9, 2008 at 8:18 AM, Kevin Sutter <kwsutter@gmail.com>  
> wrote:
>
>> This sounds interesting.  It sounds like we could provide for  
>> multiple
>> "build levels" and only promote changes when they are really  
>> ready.  All of
>> this without requiring the use of sandboxes.  Or, am I reading more  
>> into
>> this?
>>
>> Kevin
>>
>> On Tue, Dec 9, 2008 at 5:08 AM, Mark Struberg <struberg@yahoo.de>  
>> wrote:
>>
>>> Hi Patrick!
>>>
>>> In which way do you like to access the apache svn?
>>>
>>> Did you already work with git?
>>>
>>> Do you only like to manage local branches with git (git on top of  
>>> a svn
>>> checkout)?
>>>
>>> Do you like to use the git-svn bridge for doing all the local  
>>> management
>>> with git?
>>>
>>>
>>> The way I use git for Apache projects is the 'git on top' approach  
>>> (I'll
>> be
>>> more verbose since I do not know what you already know):
>>>
>>> 1.) do a svn co
>>> 2.) create a .gitignore file which contains /target and .svn
>>> 3.) modify my .svnignore to contain .git and .gitignore
>>> 4.) $> git-init
>>> 5.) $> git-add src
>>> 6.) $> git-status    to check if the index doesn't contain crap
>>> 7.) $> git-commit -m"initial import from SVN"
>>>
>>> I subsequently do some svn update and commit them to my local git  
>>> master
>>> branche.
>>> In parallel I do test branches with
>>> $> git-checkout -b mytestbranch
>>> see git-branch for more info
>>>
>>> If the changes work out, you can merge them into master and  
>>> afterwards
>>> perform a svn commit to the Apache repo.
>>>
>>>
>>> Another way would be to use the git-svn bridge. pro: you'd have  
>>> the whole
>>> history in git (so you could do a git-blame for example) con: you  
>>> cannot
>> use
>>> mvn scm (e.g. for releasing), since the maven-scm-providers-svn  
>>> relies on
>>> having a SVN structure locally and the maven-scm-providers-git  
>>> relies on
>>> having a remote git repo...
>>>
>>>
>>> LieGrü,
>>> strub
>>>
>>>
>>> --- Patrick Linskey <plinskey@gmail.com> schrieb am Di, 9.12.2008:
>>>
>>>> Von: Patrick Linskey <plinskey@gmail.com>
>>>> Betreff: [OT] git and Apache's svn?
>>>> An: dev@openjpa.apache.org
>>>> Datum: Dienstag, 9. Dezember 2008, 8:18
>>>> Hi,
>>>>
>>>> Has anyone had any experience with using git with
>>>> Apache's svn repository?
>>>>
>>>> Thanks,
>>>>
>>>> -Patrick
>>>>
>>>> --Patrick Linskey
>>>> 202 669 5907
>>>
>>>
>>>
>>>
>>

-- 
Patrick Linskey
202 669 5907


Mime
View raw message