You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@incubator.apache.org by Leo Neumeyer <le...@gmail.com> on 2011/11/09 19:07:34 UTC
Re: Git to SVN
cross-posting to incubator in case someone there also had to go through the
git to svn migration and can share their experience.
Is there a process we can follow to put s4 in the beta git program? I know
this can create additional work for the infra folks but seems we may
already have a beta system perhaps we can just try it and help improve it.
We all benefit.
-leo
On Tue, Nov 8, 2011 at 11:48 PM, Bruce Robbins
<br...@gmail.com>wrote:
> I am the fellow trying to convert the S4 git repository to SVN with
> history preserved. I gave the following a whirl:
>
> http://code.google.com/p/support/wiki/ImportingFromGit
> http://sandrotosi.blogspot.com/2010/02/migrate-git-repo-to-svn-one.html
>
> http://blog.paulbetts.org/index.php/2007/12/02/moving-git-repositories-to-svntfs/
>
> The first two basically had the same issue: it required me to manually
> resolve all merges that had been performed in the history (and we have
> many). The third one just produced a series of error messages.
>
> I have not tried the perl script yet. I will contact Jukka Zittings.
>
> However, I agree with Jeremy: it would be great if we didn't have to
> preserve history from git to svn, and then sometime later from svn back to
> git.
>
> On Tue, Nov 8, 2011 at 6:08 AM, Jeremy Thomerson <
> jeremy@thomersonfamily.com> wrote:
>
>> On Tue, Nov 8, 2011 at 12:26 AM, Paul Davis <paul.joseph.davis@gmail.com
>> >wrote:
>>
>> > > Since so many projects seem to be migrating from svn to git, is there
>> any
>> > > way we can continue using git for this project. (I mean use git only,
>> > not as
>> > > a mirror).
>> >
>> > While I can't comment on best practices for Git-to-SVN moving, I'd
>> > just like to chime in to note that "so many projects" is not a good
>> > description of the current state of Git support at the ASF. Currently
>> > there is a single project using it in a limited manner as a test for
>> > wider support. There is no proposed time table for if/when Git support
>> > will be expanded so I would proceed as if it doesn't exist.
>> >
>>
>> Is it possible that this project could be added as a beta tester of Git?
>> It really doesn't make sense to make them migrate git->svn->git. If the
>> Git experiment fails, then they do a single migration. If it succeeds, no
>> migration necessary.
>>
>> Jeremy Thomerson
>>
>
>
--
Leo Neumeyer (@leoneu)
Re: Git to SVN
Posted by Upayavira <uv...@odoko.co.uk>.
On Wednesday, November 09, 2011 1:38 PM, "Jeremy Thomerson"
<je...@thomersonfamily.com> wrote:
> On Wed, Nov 9, 2011 at 1:30 PM, Christian Grobmeier
> <gr...@gmail.com>wrote:
>
> > In addition you can ask on wave-dev. They have finally decided to
> > loose history and do an initial checkin because it was not easily
> > possible to convert.
> >
>
> Why are we doing this on any project when we potentially have a git
> solution around the corner? Why not add these projects to the git
> experiment and then only take this drastic action if the git experiment
> fails?
Because it is an experiment, and putting lots of projects on it turns it
into a real project before it is ready.
At present, the work goes to the project to get its code into Apache. If
they went to git, on failure, it would end up as infrastructure's work
to migrate it.
It needs to stay with just one project until that has reached the right
level to take on more.
Upayavira
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
For additional commands, e-mail: general-help@incubator.apache.org
Re: Git to SVN
Posted by Nick Burch <ni...@alfresco.com>.
On Wed, 9 Nov 2011, Leo Neumeyer wrote:
> Perhaps there are concerns about relying on a third party but for an
> organization powered by volunteers, using a free service like this could
> be a great benefit. Perhaps there are good reasons why this cannot be
> done but was wondering if it was discussed at all.
It's been discussed at great length, on several occasions....
I'd suggest you have a browse through the infra and infra-dev list
archives for at least some of it, along with the incubator general
archives for discussions on why incubating podlings are not currently
allowed to use git (it's come up a couple of times recently)
Nick
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
For additional commands, e-mail: general-help@incubator.apache.org
Re: Git to SVN
Posted by Upayavira <uv...@odoko.co.uk>.
The ASF exists to produce software for the public good. Its software is
its primary (only?) asset.
Therefore, it needs to be in control of this asset, and that means being
in control of the revision control tools used to maintain it.
This means that whatever revision control is used, it must be managed by
the Foundation.
As to whether Git can be used, we have an experiment happening. Folks
who want to see Git adopted can help with that experiment.
Upayavira
On Wednesday, November 09, 2011 2:49 PM, "Leo Neumeyer"
<le...@gmail.com> wrote:
> I'm curious if you also discussed using a hosted service like GitHub for
> the projects. Seems to me that it would save us so much in resources and
> time to take advantage of their free accounts for open source projects
> and
> they seem to be doing a pretty good job. Perhaps there are concerns about
> relying on a third party but for an organization powered by volunteers,
> using a free service like this could be a great benefit. Perhaps there
> are
> good reasons why this cannot be done but was wondering if it was
> discussed
> at all.
>
> -leo
>
> On Wed, Nov 9, 2011 at 10:46 AM, Christian Grobmeier
> <gr...@gmail.com>wrote:
>
> > On Wed, Nov 9, 2011 at 7:38 PM, Jeremy Thomerson
> > <je...@thomersonfamily.com> wrote:
> > >
> > > On Wed, Nov 9, 2011 at 1:30 PM, Christian Grobmeier <grobmeier@gmail.com
> > >
> > > wrote:
> > >>
> > >> In addition you can ask on wave-dev. They have finally decided to
> > >> loose history and do an initial checkin because it was not easily
> > >> possible to convert.
> > >
> > > Why are we doing this on any project when we potentially have a git
> > solution
> > > around the corner? Why not add these projects to the git experiment and
> > > then only take this drastic action if the git experiment fails?
> >
> > This discussion was already held before a while. There are many
> > questions to solve before.
> >
> > Cheers,
> > Christian
> > >
> > > Jeremy Thomerson
> > >
> >
> >
> >
> > --
> > http://www.grobmeier.de
> >
>
>
>
> --
>
> Leo Neumeyer (@leoneu)
>
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
For additional commands, e-mail: general-help@incubator.apache.org
Re: Git to SVN
Posted by Leo Neumeyer <le...@gmail.com>.
I'm curious if you also discussed using a hosted service like GitHub for
the projects. Seems to me that it would save us so much in resources and
time to take advantage of their free accounts for open source projects and
they seem to be doing a pretty good job. Perhaps there are concerns about
relying on a third party but for an organization powered by volunteers,
using a free service like this could be a great benefit. Perhaps there are
good reasons why this cannot be done but was wondering if it was discussed
at all.
-leo
On Wed, Nov 9, 2011 at 10:46 AM, Christian Grobmeier <gr...@gmail.com>wrote:
> On Wed, Nov 9, 2011 at 7:38 PM, Jeremy Thomerson
> <je...@thomersonfamily.com> wrote:
> >
> > On Wed, Nov 9, 2011 at 1:30 PM, Christian Grobmeier <grobmeier@gmail.com
> >
> > wrote:
> >>
> >> In addition you can ask on wave-dev. They have finally decided to
> >> loose history and do an initial checkin because it was not easily
> >> possible to convert.
> >
> > Why are we doing this on any project when we potentially have a git
> solution
> > around the corner? Why not add these projects to the git experiment and
> > then only take this drastic action if the git experiment fails?
>
> This discussion was already held before a while. There are many
> questions to solve before.
>
> Cheers,
> Christian
> >
> > Jeremy Thomerson
> >
>
>
>
> --
> http://www.grobmeier.de
>
--
Leo Neumeyer (@leoneu)
Re: Git to SVN
Posted by Christian Grobmeier <gr...@gmail.com>.
On Wed, Nov 9, 2011 at 7:38 PM, Jeremy Thomerson
<je...@thomersonfamily.com> wrote:
>
> On Wed, Nov 9, 2011 at 1:30 PM, Christian Grobmeier <gr...@gmail.com>
> wrote:
>>
>> In addition you can ask on wave-dev. They have finally decided to
>> loose history and do an initial checkin because it was not easily
>> possible to convert.
>
> Why are we doing this on any project when we potentially have a git solution
> around the corner? Why not add these projects to the git experiment and
> then only take this drastic action if the git experiment fails?
This discussion was already held before a while. There are many
questions to solve before.
Cheers,
Christian
>
> Jeremy Thomerson
>
--
http://www.grobmeier.de
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
For additional commands, e-mail: general-help@incubator.apache.org
Re: Git to SVN
Posted by Jeremy Thomerson <je...@thomersonfamily.com>.
On Wed, Nov 9, 2011 at 1:30 PM, Christian Grobmeier <gr...@gmail.com>wrote:
> In addition you can ask on wave-dev. They have finally decided to
> loose history and do an initial checkin because it was not easily
> possible to convert.
>
Why are we doing this on any project when we potentially have a git
solution around the corner? Why not add these projects to the git
experiment and then only take this drastic action if the git experiment
fails?
Jeremy Thomerson
Re: Git to SVN
Posted by Christian Grobmeier <gr...@gmail.com>.
Leo,
On Wed, Nov 9, 2011 at 7:07 PM, Leo Neumeyer <le...@gmail.com> wrote:
> cross-posting to incubator in case someone there also had to go through the
> git to svn migration and can share their experience.
I already mentioned you should take a look at this tool from Jukka Zitting;
https://github.com/jukka/git2svn
In addition you can ask on wave-dev. They have finally decided to
loose history and do an initial checkin because it was not easily
possible to convert.
Cheers
Christian
>
> Is there a process we can follow to put s4 in the beta git program? I know
> this can create additional work for the infra folks but seems we may
> already have a beta system perhaps we can just try it and help improve it.
> We all benefit.
>
> -leo
>
> On Tue, Nov 8, 2011 at 11:48 PM, Bruce Robbins
> <br...@gmail.com>wrote:
>
>> I am the fellow trying to convert the S4 git repository to SVN with
>> history preserved. I gave the following a whirl:
>>
>> http://code.google.com/p/support/wiki/ImportingFromGit
>> http://sandrotosi.blogspot.com/2010/02/migrate-git-repo-to-svn-one.html
>>
>> http://blog.paulbetts.org/index.php/2007/12/02/moving-git-repositories-to-svntfs/
>>
>> The first two basically had the same issue: it required me to manually
>> resolve all merges that had been performed in the history (and we have
>> many). The third one just produced a series of error messages.
>>
>> I have not tried the perl script yet. I will contact Jukka Zittings.
>>
>> However, I agree with Jeremy: it would be great if we didn't have to
>> preserve history from git to svn, and then sometime later from svn back to
>> git.
>>
>> On Tue, Nov 8, 2011 at 6:08 AM, Jeremy Thomerson <
>> jeremy@thomersonfamily.com> wrote:
>>
>>> On Tue, Nov 8, 2011 at 12:26 AM, Paul Davis <paul.joseph.davis@gmail.com
>>> >wrote:
>>>
>>> > > Since so many projects seem to be migrating from svn to git, is there
>>> any
>>> > > way we can continue using git for this project. (I mean use git only,
>>> > not as
>>> > > a mirror).
>>> >
>>> > While I can't comment on best practices for Git-to-SVN moving, I'd
>>> > just like to chime in to note that "so many projects" is not a good
>>> > description of the current state of Git support at the ASF. Currently
>>> > there is a single project using it in a limited manner as a test for
>>> > wider support. There is no proposed time table for if/when Git support
>>> > will be expanded so I would proceed as if it doesn't exist.
>>> >
>>>
>>> Is it possible that this project could be added as a beta tester of Git?
>>> It really doesn't make sense to make them migrate git->svn->git. If the
>>> Git experiment fails, then they do a single migration. If it succeeds, no
>>> migration necessary.
>>>
>>> Jeremy Thomerson
>>>
>>
>>
>
>
> --
>
> Leo Neumeyer (@leoneu)
>
--
http://www.grobmeier.de
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
For additional commands, e-mail: general-help@incubator.apache.org
Re: Git to SVN
Posted by David Lutterkort <lu...@redhat.com>.
Hi Leo,
what you are looking for is 'grafting' the master branch of your current
git repo into subversion via git-svn. This blog post[1] helped me a lot
when I was doing the same for Deltacloud.
David
[1] http://journal.sandesh247.com/2009/06/importing-git-history-into-new-svn.html
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
For additional commands, e-mail: general-help@incubator.apache.org