You are viewing a plain text version of this content. The canonical link for it is here.
Posted to odf-dev@incubator.apache.org by Svante Schubert <sv...@gmail.com> on 2017/09/15 10:43:34 UTC
[DISCUSSION] Change repository from SUBVERSION to GIT
This is the last project of mine that is using subversion and it would help
me a lot (and all others I have talked to) if we could transform the source
repository from svn to git.
Especially, as I a plan to work on a feature branch (the ODF changes
features), which works best to when working with git.
If no one else would be able to do it, I would do the work. :)
Any feedback is welcome!
Svante
ᐧ
Re: [DISCUSSION] Change repository from SUBVERSION to GIT
Posted by Tom Barber <to...@spicule.co.uk>.
I think git is a good idea, you might even be able to ask for a gitbox repo
which resides on github, either gitbox or not, it would allow users to push
to a github repo alongside the git.wip repo(if its non gitbox) which
increases the chances of 3rd party contributions and exposure for non ASF
people.
On Sat, Sep 16, 2017 at 12:39 PM, Svante Schubert <svante.schubert@gmail.com
> wrote:
> Hello Ian,
>
> Actually, I do not care much if the website remains on SVN.
> But perhaps it makes sense to have one tooling for everything in a project
> and not a mixed set.
> I was just wondering how other projects handling their website.
>
> Cheers,
> Svante
>
> 2017-09-16 12:27 GMT+02:00 Ian C <ia...@amham.net>:
>
> > Hi Svante, are you proposing parallel SVN and GIT repositories?
> >
> > I have no real preference, I like GIT and would be happy to see it there.
> >
> > Cheers,
> >
> > Ian
> >
> > On Fri, Sep 15, 2017 at 6:43 PM, Svante Schubert <
> > svante.schubert@gmail.com>
> > wrote:
> >
> > > This is the last project of mine that is using subversion and it would
> > help
> > > me a lot (and all others I have talked to) if we could transform the
> > source
> > > repository from svn to git.
> > > Especially, as I a plan to work on a feature branch (the ODF changes
> > > features), which works best to when working with git.
> > >
> > > If no one else would be able to do it, I would do the work. :)
> > >
> > > Any feedback is welcome!
> > > Svante
> > > ᐧ
> > >
> >
> >
> >
> > --
> > Cheers,
> >
> > Ian C
> >
>
Re: [DISCUSSION] Change repository from SUBVERSION to GIT
Posted by Joern Kottmann <ko...@gmail.com>.
OpenNLP migrated the site to git as well.
People strongly preferred to use git instead of subversion in our case.
The site is now updated by merging PRs to its master branch.
Jörn
On Sat, Sep 16, 2017 at 1:39 PM, Svante Schubert
<sv...@gmail.com> wrote:
> Hello Ian,
>
> Actually, I do not care much if the website remains on SVN.
> But perhaps it makes sense to have one tooling for everything in a project
> and not a mixed set.
> I was just wondering how other projects handling their website.
>
> Cheers,
> Svante
>
> 2017-09-16 12:27 GMT+02:00 Ian C <ia...@amham.net>:
>
>> Hi Svante, are you proposing parallel SVN and GIT repositories?
>>
>> I have no real preference, I like GIT and would be happy to see it there.
>>
>> Cheers,
>>
>> Ian
>>
>> On Fri, Sep 15, 2017 at 6:43 PM, Svante Schubert <
>> svante.schubert@gmail.com>
>> wrote:
>>
>> > This is the last project of mine that is using subversion and it would
>> help
>> > me a lot (and all others I have talked to) if we could transform the
>> source
>> > repository from svn to git.
>> > Especially, as I a plan to work on a feature branch (the ODF changes
>> > features), which works best to when working with git.
>> >
>> > If no one else would be able to do it, I would do the work. :)
>> >
>> > Any feedback is welcome!
>> > Svante
>> > ᐧ
>> >
>>
>>
>>
>> --
>> Cheers,
>>
>> Ian C
>>
Re: [DISCUSSION] Change repository from SUBVERSION to GIT
Posted by Svante Schubert <sv...@gmail.com>.
Hello Ian,
Actually, I do not care much if the website remains on SVN.
But perhaps it makes sense to have one tooling for everything in a project
and not a mixed set.
I was just wondering how other projects handling their website.
Cheers,
Svante
2017-09-16 12:27 GMT+02:00 Ian C <ia...@amham.net>:
> Hi Svante, are you proposing parallel SVN and GIT repositories?
>
> I have no real preference, I like GIT and would be happy to see it there.
>
> Cheers,
>
> Ian
>
> On Fri, Sep 15, 2017 at 6:43 PM, Svante Schubert <
> svante.schubert@gmail.com>
> wrote:
>
> > This is the last project of mine that is using subversion and it would
> help
> > me a lot (and all others I have talked to) if we could transform the
> source
> > repository from svn to git.
> > Especially, as I a plan to work on a feature branch (the ODF changes
> > features), which works best to when working with git.
> >
> > If no one else would be able to do it, I would do the work. :)
> >
> > Any feedback is welcome!
> > Svante
> > ᐧ
> >
>
>
>
> --
> Cheers,
>
> Ian C
>
Re: [DISCUSSION] Change repository from SUBVERSION to GIT
Posted by Ian C <ia...@amham.net>.
Hi Svante, are you proposing parallel SVN and GIT repositories?
I have no real preference, I like GIT and would be happy to see it there.
Cheers,
Ian
On Fri, Sep 15, 2017 at 6:43 PM, Svante Schubert <sv...@gmail.com>
wrote:
> This is the last project of mine that is using subversion and it would help
> me a lot (and all others I have talked to) if we could transform the source
> repository from svn to git.
> Especially, as I a plan to work on a feature branch (the ODF changes
> features), which works best to when working with git.
>
> If no one else would be able to do it, I would do the work. :)
>
> Any feedback is welcome!
> Svante
> ᐧ
>
--
Cheers,
Ian C
Re: [DISCUSSION] Change repository from SUBVERSION to GIT
Posted by Svante Schubert <sv...@gmail.com>.
Thank you, Michael, for your detailed analysis.
From the yet given feedback, I would suggest the following to ask for in a
ticket to Apache infrastructure:
We move on with two git repositories.
1. One for the Apache website "/site" and
2. the other with everything that is yet under "trunk" and already the
base from our GitHub copy.
In Subversion, the tags are just directory with all sources being copied as
a snap-shot and should be integrated within GIT as "git tags".
The "pmc" seems no longer needed and the "documents/" seems outdated.
Although we should make sure to move the latest ODT version of the Simple
API cookbook to the website as a download.
In addition, we should explicitly ask in the upcoming INFRA ticket (see
this ticket from Ticka for example
<https://issues.apache.org/jira/browse/INFRA-11092>) to rename the trunk
branch to master and mention your post in case they do not know it:
http://www.sailmaker.co.uk/blog/2013/05/05/migrating-
from-svn-to-git-preserving-branches-and-tags-3/
As Tom mentioned, it would be good to be able to receive patches from
GitHub pull requests to increase visibility by none Apache people.
Hope you are all at the start of a great week!
Svante
ᐧ
2017-09-17 22:12 GMT+02:00 Michael Stahl <ms...@redhat.com>:
> On 15.09.2017 12:43, Svante Schubert wrote:
> > This is the last project of mine that is using subversion and it would
> help
> > me a lot (and all others I have talked to) if we could transform the
> source
> > repository from svn to git.
> > Especially, as I a plan to work on a feature branch (the ODF changes
> > features), which works best to when working with git.
> >
> > If no one else would be able to do it, I would do the work. :)
>
> hi Svante,
>
> that's a great idea! i've done a bit of reading on this...
>
>
> the SVN repo is at: https://svn.apache.org/repos/asf/incubator/odf/
>
> * documents/
> not sure what this stuff is
>
> * pmc/
> ip-clearance! not sure if still relevant or only of historical
> interest?
>
> * site/
> the website - if it should be converted in git, then it should be a
> separate repository
>
> * tags/
> * trunk/
> these two would go into a "odftoolkit" git repo
>
>
> Git hosting at the ASF: https://git.apache.org/
>
> this mentions there are 2 different ways to host git repos, "git-wip"
> and "gitbox". from a quick read of the linked documentation, i get the
> impression that "git-wip" is a read-write git repo hosted on an ASF
> server, and "gitbox" is a read-write git repo hosted on a different ASF
> server which can be mirrored on GitHub.
>
> but i'm not sure what exactly the differences are between these 2
> options, maybe someone with more ASF experience knows more?
>
> furthermore, apparently there's already a (read-only) git-svn mirror of
> odftoolkit at git://git.apache.org/odftoolkit.git and again at
> https://github.com/apache/odftoolkit
>
>
> how to actually convert the SVN repo to git?
>
> it can be done manually by git-svn and some conversion steps, like
> described here:
>
> http://www.sailmaker.co.uk/blog/2013/05/05/migrating-
> from-svn-to-git-preserving-branches-and-tags-3/
>
> however it looks like the git://git.apache.org/odftoolkit.git repo has
> already done a lot of the work, and crucially already uses a properly
> set up "author map" so we get "Svante Schubert
> <sv...@apache.org>" and not "svanteschubert
> <sv...@13f79535-47bb-0310-9956-ffa450edef68>" as in my local
> git-svn clone.
>
> the main things in there that look odd from a git perspective are the
> "trunk" instead of "master", and there are a couple of tags that look
> bogus:
>
> > > git tag
> > 0.5-incubating-rc1
> > 0.5-incubating-rc2
> > 0.5-incubating-rc3
> > 0.5-incubating-rc4
> > 0.5-incubating-rc5
> > 0.5-incubating-rc7
> > 0.6-incubating-rc1
> > 0.6-incubating-rc2
> > 0.6-incubating-rc3
> > 0.6-incubating-rc4
> > 0.6-incubating-rc5
> > 0.6-incubating-rc6
> > assemble
> > generator
> > legal
> > odfdom
> > odftoolkit-0.5-incubating
> > odftoolkit-0.6.1-incubating-RC1
> > odftoolkit-0.6.1-incubating-RC2
> > odftoolkit-0.6.1-incubating-RC3
> > odftoolkit-0.6.1-incubating-RC4
> > odftoolkit-0.6.2-incubating
> > odftoolkit-0.6.2-incubating-RC1
> > odftoolkit-0.6.3-incubating
> > simple
> > taglets
> > validator
> > xslt-runner
> > xslt-runner-task
>
> half of these "tags" are directory names, probably should be deleted
> because:
>
> > > git log xslt-runner
> > fatal: ambiguous argument 'xslt-runner': both revision and filename
> > Use '--' to separate paths from revisions, like this:
> > 'git <command> [<revision>...] -- [<file>...]'
>
> so, this part looks quite easy.
>
> regards,
> michael
>
>
Re: [DISCUSSION] Change repository from SUBVERSION to GIT
Posted by Michael Stahl <ms...@redhat.com>.
On 15.09.2017 12:43, Svante Schubert wrote:
> This is the last project of mine that is using subversion and it would help
> me a lot (and all others I have talked to) if we could transform the source
> repository from svn to git.
> Especially, as I a plan to work on a feature branch (the ODF changes
> features), which works best to when working with git.
>
> If no one else would be able to do it, I would do the work. :)
hi Svante,
that's a great idea! i've done a bit of reading on this...
the SVN repo is at: https://svn.apache.org/repos/asf/incubator/odf/
* documents/
not sure what this stuff is
* pmc/
ip-clearance! not sure if still relevant or only of historical
interest?
* site/
the website - if it should be converted in git, then it should be a
separate repository
* tags/
* trunk/
these two would go into a "odftoolkit" git repo
Git hosting at the ASF: https://git.apache.org/
this mentions there are 2 different ways to host git repos, "git-wip"
and "gitbox". from a quick read of the linked documentation, i get the
impression that "git-wip" is a read-write git repo hosted on an ASF
server, and "gitbox" is a read-write git repo hosted on a different ASF
server which can be mirrored on GitHub.
but i'm not sure what exactly the differences are between these 2
options, maybe someone with more ASF experience knows more?
furthermore, apparently there's already a (read-only) git-svn mirror of
odftoolkit at git://git.apache.org/odftoolkit.git and again at
https://github.com/apache/odftoolkit
how to actually convert the SVN repo to git?
it can be done manually by git-svn and some conversion steps, like
described here:
http://www.sailmaker.co.uk/blog/2013/05/05/migrating-from-svn-to-git-preserving-branches-and-tags-3/
however it looks like the git://git.apache.org/odftoolkit.git repo has
already done a lot of the work, and crucially already uses a properly
set up "author map" so we get "Svante Schubert
<sv...@apache.org>" and not "svanteschubert
<sv...@13f79535-47bb-0310-9956-ffa450edef68>" as in my local
git-svn clone.
the main things in there that look odd from a git perspective are the
"trunk" instead of "master", and there are a couple of tags that look bogus:
> > git tag
> 0.5-incubating-rc1
> 0.5-incubating-rc2
> 0.5-incubating-rc3
> 0.5-incubating-rc4
> 0.5-incubating-rc5
> 0.5-incubating-rc7
> 0.6-incubating-rc1
> 0.6-incubating-rc2
> 0.6-incubating-rc3
> 0.6-incubating-rc4
> 0.6-incubating-rc5
> 0.6-incubating-rc6
> assemble
> generator
> legal
> odfdom
> odftoolkit-0.5-incubating
> odftoolkit-0.6.1-incubating-RC1
> odftoolkit-0.6.1-incubating-RC2
> odftoolkit-0.6.1-incubating-RC3
> odftoolkit-0.6.1-incubating-RC4
> odftoolkit-0.6.2-incubating
> odftoolkit-0.6.2-incubating-RC1
> odftoolkit-0.6.3-incubating
> simple
> taglets
> validator
> xslt-runner
> xslt-runner-task
half of these "tags" are directory names, probably should be deleted
because:
> > git log xslt-runner
> fatal: ambiguous argument 'xslt-runner': both revision and filename
> Use '--' to separate paths from revisions, like this:
> 'git <command> [<revision>...] -- [<file>...]'
so, this part looks quite easy.
regards,
michael