You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openjpa.apache.org by Patrick Linskey <pl...@gmail.com> on 2008/12/09 08:18:06 UTC
[OT] git and Apache's svn?
Hi,
Has anyone had any experience with using git with Apache's svn
repository?
Thanks,
-Patrick
--
Patrick Linskey
202 669 5907
Re: [OT] git and Apache's svn?
Posted by Jukka Zitting <ju...@gmail.com>.
Hi,
On Wed, Dec 10, 2008 at 6:03 PM, Patrick Linskey <pl...@gmail.com> wrote:
>> but if you like I can set it up to automatically pick up commits based on
>> commit notification emails.
>
> Yeah, that'd be great.
OK, I'll set it up.
> Are there any FAQs out there about how committers might use your mirrors?
Not really, apart from the infra-dev list archives. I've been meaning
to write a summary of the git talk I gave at the BarCamp Apache a
month ago, but so far I haven't found the spare cycles for that (the
Jackrabbit 1.5.0 release took up quite a bit of my time...).
BR,
Jukka Zitting
Re: [OT] git and Apache's svn?
Posted by Patrick Linskey <pl...@gmail.com>.
> I've now completed the setup of a git mirror for OpenJPA at
> http://jukka.zitting.name/git/. The mirror is updated nightly,
Thanks!
> but if you like I can set it up to automatically pick up commits
> based on
> commit notification emails.
Yeah, that'd be great. Are there any FAQs out there about how
committers might use your mirrors?
-Patrick
On Dec 10, 2008, at 1:54 AM, Jukka Zitting wrote:
> Hi,
>
> On Tue, Dec 9, 2008 at 8:18 AM, Patrick Linskey <pl...@gmail.com>
> wrote:
>> Has anyone had any experience with using git with Apache's svn
>> repository?
>
> Yeah, as Graig noted, you'll find us at the
> infrastructure-dev@apache.org mailing list, see the archives at
> http://markmail.org/search/?q=list%3Aorg.apache.infrastructure-dev.
>
> I've now completed the setup of a git mirror for OpenJPA at
> http://jukka.zitting.name/git/. The mirror is updated nightly, but if
> you like I can set it up to automatically pick up commits based on
> commit notification emails.
>
> Please join us at infrastructure-dev@ if you have any questions or
> suggestions about the mirror or git usage in general. It would be
> great also to continue the "commit authenticity" discussion there.
>
> BR,
>
> Jukka Zitting
--
Patrick Linskey
202 669 5907
Re: [OT] git and Apache's svn?
Posted by Jukka Zitting <ju...@gmail.com>.
Hi,
On Tue, Dec 9, 2008 at 8:18 AM, Patrick Linskey <pl...@gmail.com> wrote:
> Has anyone had any experience with using git with Apache's svn repository?
Yeah, as Graig noted, you'll find us at the
infrastructure-dev@apache.org mailing list, see the archives at
http://markmail.org/search/?q=list%3Aorg.apache.infrastructure-dev.
I've now completed the setup of a git mirror for OpenJPA at
http://jukka.zitting.name/git/. The mirror is updated nightly, but if
you like I can set it up to automatically pick up commits based on
commit notification emails.
Please join us at infrastructure-dev@ if you have any questions or
suggestions about the mirror or git usage in general. It would be
great also to continue the "commit authenticity" discussion there.
BR,
Jukka Zitting
Re: [OT] git and Apache's svn?
Posted by Jukka Zitting <ju...@gmail.com>.
Hi,
On Tue, Dec 9, 2008 at 8:18 AM, Patrick Linskey <pl...@gmail.com> wrote:
> Has anyone had any experience with using git with Apache's svn repository?
Yeah, as Graig noted, you'll find us at the
infrastructure-dev@apache.org mailing list, see the archives at
http://markmail.org/search/?q=list%3Aorg.apache.infrastructure-dev.
I've now completed the setup of a git mirror for OpenJPA at
http://jukka.zitting.name/git/. The mirror is updated nightly, but if
you like I can set it up to automatically pick up commits based on
commit notification emails.
Please join us at infrastructure-dev@ if you have any questions or
suggestions about the mirror or git usage in general. It would be
great also to continue the "commit authenticity" discussion there.
BR,
Jukka Zitting
Re: [OT] git and Apache's svn?
Posted by Patrick Linskey <pl...@gmail.com>.
> 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 <kw...@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 <st...@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 <pl...@gmail.com> schrieb am Di, 9.12.2008:
>>>
>>>> Von: Patrick Linskey <pl...@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
Re: [OT] git and Apache's svn?
Posted by Michael Dick <mi...@gmail.com>.
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 <kw...@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 <st...@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 <pl...@gmail.com> schrieb am Di, 9.12.2008:
> >
> > > Von: Patrick Linskey <pl...@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
> >
> >
> >
> >
>
Re: [OT] git and Apache's svn?
Posted by Mark Struberg <st...@yahoo.de>.
Yes, that's what the whole thing about git is!
This usually works the following:
I see some bug I like to fix, or have some improvement and like to implement it.
I then setup a local git repo for this project and fix the issues.
I commit the local changes into my git-repo and push them to some public repo (e.g. my private http://ns1.backwork.net/git)
The next step is to ping the mailing list or the maintainer of this plugin and tell him to clone/pull my changes. ( e.g.
>$ git-clone http://ns1.backwork.net/git/openjpa-maven-plugin.git
)
If the changes are ok, he'll merge them into svn and commit it to the main repo.
The benefit over svn sandboxes is huge: no authorisation problem, easy merging, other users can come up with an alternate approach/fix for the fix by cloning and changing + pushing to their repos, etc
A good and also really amusing overview about how to develop with git (from a google speech by Linus Torvalds himself):
http://www.youtube.com/watch?v=4XpnKHJAok8
LieGrue,
strub
--- Kevin Sutter <kw...@gmail.com> schrieb am Di, 9.12.2008:
> Von: Kevin Sutter <kw...@gmail.com>
> Betreff: Re: [OT] git and Apache's svn?
> An: dev@openjpa.apache.org
> Datum: Dienstag, 9. Dezember 2008, 15:18
> 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
> <st...@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 <pl...@gmail.com> schrieb
> am Di, 9.12.2008:
> >
> > > Von: Patrick Linskey <pl...@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
> >
> >
> >
> >
Re: [OT] git and Apache's svn?
Posted by Martin Cooper <ma...@apache.org>.
Folks,
All of the git discussions have been happening on infrastructure-dev, rather
than here, so it would perhaps be a better idea to continue this
conversation where the bulk of the people interested in git are hanging out.
--
Martin Cooper
On Tue, Dec 9, 2008 at 2:14 PM, Mark Struberg <st...@yahoo.de> wrote:
> Hi Craig!
>
> Answers inside...
>
>
> --- Craig L Russell <Cr...@Sun.COM> schrieb am Di, 9.12.2008:
>
> > Von: Craig L Russell <Cr...@Sun.COM>
> > Betreff: Re: [OT] git and Apache's svn?
> > An: dev@openjpa.apache.org
> > CC: infrastructure@apache.org
> > Datum: Dienstag, 9. Dezember 2008, 19:15
> > There is a group inside Apache who are advocating for an
> > official git repo managed by Apache infrastructure. The
> > discussion is ongoing...
> You may contact Jason van Zyl, with whom I had a similar discussion more
> than 1 year or so ago. I can remember that he was quite happy with git.
>
> > I am not an expert on git, so take this as an observation
> > more than fact: One big concern with git is the lack of
> > "accountability" with code changes. Once code has
> > been pushed to a git repo, the identity of the committer is
> > lost, or at least not easily found. And unlike having the
> > code attached to a JIRA, with an explicit "Apache
> > licensed contribution" there is no automatic way to
> > guarantee that a git-managed code change is actually
> > intended as a contribution.
> Actually it is exactly the opposite! If you use git the git way, then the
> information about the author, his email, the date of the change and the
> original commit msg is preserved, regardless of how many pulls and repos are
> between the creation and the last merge.
> The 2nd argument is therefore also not that a problem. You can bet that
> Linus did take care a lot about this after the SCO trial ;)
>
> >
> > The other big concern is transparency. Without a
> > centrally-managed git repo (see above) there is no way for
> > the community to easily see what is being developed where.
> That's kind of true. In practice this is not such a big problem since the
> changes will be reflected in the main svn.
>
> > I have no dog in this hunt. My aim is for the OpenJPA team
> > to be as productive and engaged as possible, while staying
> > true to the spirit and rules of the foundation. So for now,
> > creating and using git-on-svn is fine for individuals, but
> > to use git project-wide needs more explicit guidance from
> > the foundation.
> This would imho require official support from the Apache infrastructure
> team.
>
> LieGrue,
> strub
>
> >
> > Craig
> >
> > On Dec 9, 2008, at 7:58 AM, Patrick Linskey wrote:
> >
> > > Yeah, git is amazing. Lets you do lots of interesting
> > things, collaboration-wise.
> > >
> > > That said, I imagine that we want to stay with the
> > Apache Way for our primary source repository story, which
> > means svn for the foreseeable future I'd imagine. I
> > expect that we'd see a lot of benefit by moving to svn
> > 1.5 (which has proper merge support, and thus helps a lot
> > with branching).
> > >
> > > -Patrick
> > >
> > > On Dec 9, 2008, at 6:18 AM, Kevin Sutter 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
> > <st...@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 <pl...@gmail.com>
> > schrieb am Di, 9.12.2008:
> > >>>
> > >>>> Von: Patrick Linskey
> > <pl...@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
> > >
> >
> > Craig L Russell
> > Architect, Sun Java Enterprise System
> > http://db.apache.org/jdo
> > 408 276-5638 mailto:Craig.Russell@sun.com
> > P.S. A good JDO? O, Gasp!
>
>
>
>
Re: [OT] git and Apache's svn?
Posted by Kevin Sutter <kw...@gmail.com>.
Thanks for the insights, Craig. It's good to know that the infrastructure
team is taking a look at this also. I'm definitely not ready to jump on the
git wagon just yet, but it's always good to understand the options.
Kevin
On Tue, Dec 9, 2008 at 12:15 PM, Craig L Russell <Cr...@sun.com>wrote:
> There is a group inside Apache who are advocating for an official git repo
> managed by Apache infrastructure. The discussion is ongoing...
>
> I am not an expert on git, so take this as an observation more than fact:
> One big concern with git is the lack of "accountability" with code changes.
> Once code has been pushed to a git repo, the identity of the committer is
> lost, or at least not easily found. And unlike having the code attached to a
> JIRA, with an explicit "Apache licensed contribution" there is no automatic
> way to guarantee that a git-managed code change is actually intended as a
> contribution.
>
> The other big concern is transparency. Without a centrally-managed git repo
> (see above) there is no way for the community to easily see what is being
> developed where.
>
> I have no dog in this hunt. My aim is for the OpenJPA team to be as
> productive and engaged as possible, while staying true to the spirit and
> rules of the foundation. So for now, creating and using git-on-svn is fine
> for individuals, but to use git project-wide needs more explicit guidance
> from the foundation.
>
> Craig
>
>
> On Dec 9, 2008, at 7:58 AM, Patrick Linskey wrote:
>
> Yeah, git is amazing. Lets you do lots of interesting things,
>> collaboration-wise.
>>
>> That said, I imagine that we want to stay with the Apache Way for our
>> primary source repository story, which means svn for the foreseeable future
>> I'd imagine. I expect that we'd see a lot of benefit by moving to svn 1.5
>> (which has proper merge support, and thus helps a lot with branching).
>>
>> -Patrick
>>
>> On Dec 9, 2008, at 6:18 AM, Kevin Sutter 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 <st...@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 <pl...@gmail.com> schrieb am Di, 9.12.2008:
>>>>
>>>> Von: Patrick Linskey <pl...@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
>>
>>
> Craig L Russell
> Architect, Sun Java Enterprise System http://db.apache.org/jdo
> 408 276-5638 mailto:Craig.Russell@sun.com
> P.S. A good JDO? O, Gasp!
>
>
Re: [OT] git and Apache's svn?
Posted by Patrick Linskey <pl...@gmail.com>.
> I am not an expert on git, so take this as an observation more than
> fact: One big concern with git is the lack of "accountability" with
> code changes. Once code has been pushed to a git repo, the identity
> of the committer is lost, or at least not easily found.
Hmm... I think that git actually is pretty strong in this regard. A
git commit includes an "author", which can include an email address.
The commit is then identified by the SHA-1 of the commit message + the
diff, so it's very difficult to tamper with existing commit history.
Now, there is no private key involved in that process, so clearly, I
could claim to be clr@apache.org (git config user.email
clr@apache.org) and create a commit that is falsely attributed to you.
But is that the concern?
It's even possible for me to commit someone else's changes and
preserve both the fact that I did the committing but that the other
person did the authoring (git commit --author "Craig Russell <clr@apache.org
>" --signoff "Patrick Linskey <pc...@apache.org>").
> And unlike having the code attached to a JIRA, with an explicit
> "Apache licensed contribution" there is no automatic way to
> guarantee that a git-managed code change is actually intended as a
> contribution.
The JIRA-based patch management system is definitely more robust from
an opt-in standpoint. Are people suggesting that git would replace
JIRA as well? I can definitely imagine a git workflow that could
supplant JIRA, but I'd argue that git is sufficiently more difficult
than JIRA that that would be raising the bar too much for contributions.
There is also a case to be made to use git for source control, or to
support both git and svn for source control (if such a thing were
possible).
IMO, git has a clearly higher learning curve than svn, so it's not
clear that an organization with as many contributors as Apache would
want to raise the bar for participation by requiring git-fu to
participate. But certainly, for those of us that have bit the bullet
for one reason or another, it'd be great if there were a good story
for using git with Apache projects.
-Patrick
On Dec 9, 2008, at 10:15 AM, Craig L Russell wrote:
> There is a group inside Apache who are advocating for an official
> git repo managed by Apache infrastructure. The discussion is
> ongoing...
>
> I am not an expert on git, so take this as an observation more than
> fact: One big concern with git is the lack of "accountability" with
> code changes. Once code has been pushed to a git repo, the identity
> of the committer is lost, or at least not easily found. And unlike
> having the code attached to a JIRA, with an explicit "Apache
> licensed contribution" there is no automatic way to guarantee that a
> git-managed code change is actually intended as a contribution.
>
> The other big concern is transparency. Without a centrally-managed
> git repo (see above) there is no way for the community to easily see
> what is being developed where.
>
> I have no dog in this hunt. My aim is for the OpenJPA team to be as
> productive and engaged as possible, while staying true to the spirit
> and rules of the foundation. So for now, creating and using git-on-
> svn is fine for individuals, but to use git project-wide needs more
> explicit guidance from the foundation.
>
> Craig
>
> On Dec 9, 2008, at 7:58 AM, Patrick Linskey wrote:
>
>> Yeah, git is amazing. Lets you do lots of interesting things,
>> collaboration-wise.
>>
>> That said, I imagine that we want to stay with the Apache Way for
>> our primary source repository story, which means svn for the
>> foreseeable future I'd imagine. I expect that we'd see a lot of
>> benefit by moving to svn 1.5 (which has proper merge support, and
>> thus helps a lot with branching).
>>
>> -Patrick
>>
>> On Dec 9, 2008, at 6:18 AM, Kevin Sutter 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 <st...@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 <pl...@gmail.com> schrieb am Di, 9.12.2008:
>>>>
>>>>> Von: Patrick Linskey <pl...@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
>>
>
> Craig L Russell
> Architect, Sun Java Enterprise System http://db.apache.org/jdo
> 408 276-5638 mailto:Craig.Russell@sun.com
> P.S. A good JDO? O, Gasp!
>
--
Patrick Linskey
202 669 5907
Re: [OT] git and Apache's svn?
Posted by Mark Struberg <st...@yahoo.de>.
Hi Craig!
Answers inside...
--- Craig L Russell <Cr...@Sun.COM> schrieb am Di, 9.12.2008:
> Von: Craig L Russell <Cr...@Sun.COM>
> Betreff: Re: [OT] git and Apache's svn?
> An: dev@openjpa.apache.org
> CC: infrastructure@apache.org
> Datum: Dienstag, 9. Dezember 2008, 19:15
> There is a group inside Apache who are advocating for an
> official git repo managed by Apache infrastructure. The
> discussion is ongoing...
You may contact Jason van Zyl, with whom I had a similar discussion more than 1 year or so ago. I can remember that he was quite happy with git.
> I am not an expert on git, so take this as an observation
> more than fact: One big concern with git is the lack of
> "accountability" with code changes. Once code has
> been pushed to a git repo, the identity of the committer is
> lost, or at least not easily found. And unlike having the
> code attached to a JIRA, with an explicit "Apache
> licensed contribution" there is no automatic way to
> guarantee that a git-managed code change is actually
> intended as a contribution.
Actually it is exactly the opposite! If you use git the git way, then the information about the author, his email, the date of the change and the original commit msg is preserved, regardless of how many pulls and repos are between the creation and the last merge.
The 2nd argument is therefore also not that a problem. You can bet that Linus did take care a lot about this after the SCO trial ;)
>
> The other big concern is transparency. Without a
> centrally-managed git repo (see above) there is no way for
> the community to easily see what is being developed where.
That's kind of true. In practice this is not such a big problem since the changes will be reflected in the main svn.
> I have no dog in this hunt. My aim is for the OpenJPA team
> to be as productive and engaged as possible, while staying
> true to the spirit and rules of the foundation. So for now,
> creating and using git-on-svn is fine for individuals, but
> to use git project-wide needs more explicit guidance from
> the foundation.
This would imho require official support from the Apache infrastructure team.
LieGrue,
strub
>
> Craig
>
> On Dec 9, 2008, at 7:58 AM, Patrick Linskey wrote:
>
> > Yeah, git is amazing. Lets you do lots of interesting
> things, collaboration-wise.
> >
> > That said, I imagine that we want to stay with the
> Apache Way for our primary source repository story, which
> means svn for the foreseeable future I'd imagine. I
> expect that we'd see a lot of benefit by moving to svn
> 1.5 (which has proper merge support, and thus helps a lot
> with branching).
> >
> > -Patrick
> >
> > On Dec 9, 2008, at 6:18 AM, Kevin Sutter 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
> <st...@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 <pl...@gmail.com>
> schrieb am Di, 9.12.2008:
> >>>
> >>>> Von: Patrick Linskey
> <pl...@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
> >
>
> Craig L Russell
> Architect, Sun Java Enterprise System
> http://db.apache.org/jdo
> 408 276-5638 mailto:Craig.Russell@sun.com
> P.S. A good JDO? O, Gasp!
Re: [OT] git and Apache's svn?
Posted by Craig L Russell <Cr...@Sun.COM>.
There is a group inside Apache who are advocating for an official git
repo managed by Apache infrastructure. The discussion is ongoing...
I am not an expert on git, so take this as an observation more than
fact: One big concern with git is the lack of "accountability" with
code changes. Once code has been pushed to a git repo, the identity of
the committer is lost, or at least not easily found. And unlike having
the code attached to a JIRA, with an explicit "Apache licensed
contribution" there is no automatic way to guarantee that a git-
managed code change is actually intended as a contribution.
The other big concern is transparency. Without a centrally-managed git
repo (see above) there is no way for the community to easily see what
is being developed where.
I have no dog in this hunt. My aim is for the OpenJPA team to be as
productive and engaged as possible, while staying true to the spirit
and rules of the foundation. So for now, creating and using git-on-svn
is fine for individuals, but to use git project-wide needs more
explicit guidance from the foundation.
Craig
On Dec 9, 2008, at 7:58 AM, Patrick Linskey wrote:
> Yeah, git is amazing. Lets you do lots of interesting things,
> collaboration-wise.
>
> That said, I imagine that we want to stay with the Apache Way for
> our primary source repository story, which means svn for the
> foreseeable future I'd imagine. I expect that we'd see a lot of
> benefit by moving to svn 1.5 (which has proper merge support, and
> thus helps a lot with branching).
>
> -Patrick
>
> On Dec 9, 2008, at 6:18 AM, Kevin Sutter 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 <st...@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 <pl...@gmail.com> schrieb am Di, 9.12.2008:
>>>
>>>> Von: Patrick Linskey <pl...@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
>
Craig L Russell
Architect, Sun Java Enterprise System http://db.apache.org/jdo
408 276-5638 mailto:Craig.Russell@sun.com
P.S. A good JDO? O, Gasp!
Re: [OT] git and Apache's svn?
Posted by Patrick Linskey <pl...@gmail.com>.
Yeah, git is amazing. Lets you do lots of interesting things,
collaboration-wise.
That said, I imagine that we want to stay with the Apache Way for our
primary source repository story, which means svn for the foreseeable
future I'd imagine. I expect that we'd see a lot of benefit by moving
to svn 1.5 (which has proper merge support, and thus helps a lot with
branching).
-Patrick
On Dec 9, 2008, at 6:18 AM, Kevin Sutter 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 <st...@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 <pl...@gmail.com> schrieb am Di, 9.12.2008:
>>
>>> Von: Patrick Linskey <pl...@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
Re: [OT] git and Apache's svn?
Posted by Kevin Sutter <kw...@gmail.com>.
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 <st...@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 <pl...@gmail.com> schrieb am Di, 9.12.2008:
>
> > Von: Patrick Linskey <pl...@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
>
>
>
>
Re: AW: [OT] git and Apache's svn?
Posted by Mark Struberg <st...@yahoo.de>.
Regarding git-svn vs 'git on top'
There's no free lunch, as ever ;)
The git on top technique also has a few flaws:
If a small group uses git to develop a feature (e.g. in an own branch), this changes have to be commited into SVN at the end of the day. In my local scenario, where I (or one of my direct colleagues) do all the work it doesn't matter who did exactly what. So I only do one single commit to my SVN repo with all the changes cumulated.
But in an OSS project where many people work on a feature, you may get 30++ commits in almost no time. And it would be nice to keep all the history we have in git at least textual via the commit msg. For CVS there is something called git-cvsexportcommit, but I cannot remember if there is something similar for SVN.
So there is a little bit left to do. But that is nothing which cannot be fixed with a little shell script ;)
LieGrue,
strub
PS: I also had problems with git-svn when I worked on maven-scm. Have you tried to --limit the history while importing? I mean, do we really need _all_ the history from SVN in our git repo?
--- Patrick Linskey <pl...@gmail.com> schrieb am Di, 9.12.2008:
> Von: Patrick Linskey <pl...@gmail.com>
> Betreff: Re: AW: [OT] git and Apache's svn?
> An: dev@openjpa.apache.org
> Datum: Dienstag, 9. Dezember 2008, 17:13
> > In which way do you like to access the apache svn?
>
> To date, I've only used svn to access Apache.
>
> > Did you already work with git?
>
> Yes.
>
> > Do you like to use the git-svn bridge for doing all
> the local management with git?
>
> I've done this in the past with an svn repo.
>
> > Do you only like to manage local branches with git
> (git on top of a svn checkout)?
>
> That's an interesting technique!
>
>
> Ideally, I'd love it if those of us who choose to use
> git could use normal git repository collaboration techniques
> somewhere, and any of us could then push changes into svn
> somehow. I've run into problems with this in the past
> because of the 'git-svn' text that gets inserted
> into the commit messages, which mucks with the SHA-1
> identities of commits, and thus with histories.
>
> I guess with your git-on-top technique, we could push repos
> to github that contain just a single branch (or all
> branches, in exploded format), and we'd be able to
> collaborate meaningfully, but with svn-style "project
> branching" instead of git-style.
>
> FTR, I tried to 'git svn clone' the Apache repo
> last night, and got this after about 45 mins:
>
> > RA layer request failed: REPORT request failed on
> '/repos/asf/!svn/vcc/default': REPORT of
> '/repos/asf/!svn/vcc/default': 403 Forbidden
> (https://svn.apache.org) at
> /usr/local/git/libexec/git-core/git-svn line 3957
>
>
> -Patrick
>
> On Dec 9, 2008, at 3:08 AM, Mark Struberg 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 <pl...@gmail.com> schrieb
> am Di, 9.12.2008:
> >
> >> Von: Patrick Linskey <pl...@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
Re: AW: [OT] git and Apache's svn?
Posted by Patrick Linskey <pl...@gmail.com>.
> In which way do you like to access the apache svn?
To date, I've only used svn to access Apache.
> Did you already work with git?
Yes.
> Do you like to use the git-svn bridge for doing all the local
> management with git?
I've done this in the past with an svn repo.
> Do you only like to manage local branches with git (git on top of a
> svn checkout)?
That's an interesting technique!
Ideally, I'd love it if those of us who choose to use git could use
normal git repository collaboration techniques somewhere, and any of
us could then push changes into svn somehow. I've run into problems
with this in the past because of the 'git-svn' text that gets inserted
into the commit messages, which mucks with the SHA-1 identities of
commits, and thus with histories.
I guess with your git-on-top technique, we could push repos to github
that contain just a single branch (or all branches, in exploded
format), and we'd be able to collaborate meaningfully, but with svn-
style "project branching" instead of git-style.
FTR, I tried to 'git svn clone' the Apache repo last night, and got
this after about 45 mins:
> RA layer request failed: REPORT request failed on '/repos/asf/!svn/
> vcc/default': REPORT of '/repos/asf/!svn/vcc/default': 403 Forbidden
> (https://svn.apache.org) at /usr/local/git/libexec/git-core/git-svn
> line 3957
-Patrick
On Dec 9, 2008, at 3:08 AM, Mark Struberg 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 <pl...@gmail.com> schrieb am Di, 9.12.2008:
>
>> Von: Patrick Linskey <pl...@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
AW: [OT] git and Apache's svn?
Posted by Mark Struberg <st...@yahoo.de>.
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 <pl...@gmail.com> schrieb am Di, 9.12.2008:
> Von: Patrick Linskey <pl...@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