Re: AOO is now also available as GIT (READ-ONLY).
Hi, On 19.12.2013 03:22, Herbert Duerr wrote: On 18.12.2013 18:38, jan i wrote: Infra-5590 has now been solved, thanks to an effort from jfarrell: jfarrell 16:11:32 janIV: christmas gift for you. took a little over a week to wrap, had to use duct tape along the way. git ls-remote git:// git.apache.org/openoffice.git Please have a look at our new READ-ONLY git mirror. That's great news, thanks! Kudos to Jake. Having a reference git-repository will allow us to do some nifty things: I'll prepare some git-packs with pre-AOO history from its older Mercurial, Subversion and maybe even from its CVS-based open-source ancestors. Using git's graft facilities this will make it much easier to research the history of parts of the codebase where noone is left to tell the story or its details. Having the individual commit comments and their issue numbers is invaluable then. Is there a gitweb or similar frontend to our git-mirror? Then we could e.g. provide a link from the nightly builds to their respective version history. As expected in my JIRA-request the two-level deep svn-branches (i.e. alg/aw080 and alg/sysdepgs) have been munged into one git-branch... These are my branches and I am concerned, these contain quite some work. I think that adding some more strutcture as I did by adding my branches to an own directory is in general not a bad thing, so if this could be made to work with the git mirror somehow easily, this would be the easiest way for now. The alternative would be to somehow 'move' these branches, e.g. branches/alg/aw080 - branches/alg_aw080 branches/alg/sysdepgs - branches/alg_sysdepgs If it is intended to have a flat hierarchy in the branches subdirectory I will try to do so and I am open to suggestions how to do that without immense new amounts of commits and similar stuff. I currently see no easy way to do this with svn, but maybe some experts could help with suggestions here. Thanks for the git clone! Looking forward to suggestions.. Also the symphony branch is missing because it was checked into svn at a non-canonic location so the git-mirror couldn't pick it up. Once everybody is happy, we can consider moving fully to GIT, I will however recommend to it imidiatly after next release. I'll have to adjust the svn2bz bot, we'll have to adjust the buildbots and there are some other scripts that have to be updated before we can think about a full switch. But I look forward to git's proper author attributions, interactive rebasing, intact individual commits after merges, nice cherry-picks, etc. Herbert - To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org - To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
Re: AOO is now also available as GIT (READ-ONLY).
Thanks to everybody who worked on this. It is a great first step. Now let's hope that we don't end like xkcd.com/1296/ (once we have write support). -Andre On Dec 18, 2013 6:38 PM, jan i j...@apache.org wrote: Hi Infra-5590 has now been solved, thanks to an effort from jfarrell: jfarrell 16:11:32 janIV: christmas gift for you. took a little over a week to wrap, had to use duct tape along the way. git ls-remote git:// git.apache.org/openoffice.git Please have a look at our new READ-ONLY git mirror. Once everybody is happy, we can consider moving fully to GIT, I will however recommend to it imidiatly after next release. rgds jan I.
Re: AOO is now also available as GIT (READ-ONLY).
On 19 December 2013 11:22, Herbert Duerr h...@apache.org wrote: On 18.12.2013 18:38, jan i wrote: Infra-5590 has now been solved, thanks to an effort from jfarrell: jfarrell 16:11:32 janIV: christmas gift for you. took a little over a week to wrap, had to use duct tape along the way. git ls-remote git:// git.apache.org/openoffice.git Please have a look at our new READ-ONLY git mirror. That's great news, thanks! Kudos to Jake. Having a reference git-repository will allow us to do some nifty things: I'll prepare some git-packs with pre-AOO history from its older Mercurial, Subversion and maybe even from its CVS-based open-source ancestors. Using git's graft facilities this will make it much easier to research the history of parts of the codebase where noone is left to tell the story or its details. Having the individual commit comments and their issue numbers is invaluable then. Is there a gitweb or similar frontend to our git-mirror? Then we could e.g. provide a link from the nightly builds to their respective version history. As expected in my JIRA-request the two-level deep svn-branches (i.e. alg/aw080 and alg/sysdepgs) have been munged into one git-branch... We have anyhow to consider it the GIT branch is a practial solution, I just did a branch switch and encountered 2 problem: 1. The switch alone to 20 minutes 2. I had to rebuilt everything because (in my case) unxlngx6.pro is used for trunk and branch. We can with a relative simple patch platform= to configure avoid 2, but 1 is going to be PITN. Also the symphony branch is missing because it was checked into svn at a non-canonic location so the git-mirror couldn't pick it up. If those branches are changed to normal, the mirror should pick it up. Once everybody is happy, we can consider moving fully to GIT, I will however recommend to it imidiatly after next release. I'll have to adjust the svn2bz bot, we'll have to adjust the buildbots and there are some other scripts that have to be updated before we can think about a full switch. But I look forward to git's proper author attributions, interactive rebasing, intact individual commits after merges, nice cherry-picks, etc. I think we should have a discussion on the list. I am convinced that git offer some advantages but also some disadvantages (like branch switching) and I feel everybody should have a clear view of pro/con before we decide. rgds jan I. Herbert - To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
Re: AOO is now also available as GIT (READ-ONLY).
Hello Jan, On 19.12.2013 15:37, jan i wrote: We have anyhow to consider it the GIT branch is a practial solution, I just did a branch switch and encountered 2 problem: 1. The switch alone to 20 minutes A svn switch between two branches takes about the same time, doesn't it? Window's file access is unfortunately quite slow. On Linux or on Mac the filesystems are no bottleneck so checkouts don't take long. 2. I had to rebuilt everything because (in my case) unxlngx6.pro is used for trunk and branch. Well, if trunk and branch are incompatible (i.e. some project wide headers changed, build options changed or there are binary incompatibilites between some libs) then you need clean rebuilds or different output trees regardless of the version control system. Does subversion have some magic that makes such incompatibilities go away? If there is such a magic then that would certainly be nobel price worthy ;-) But maybe you are using a different setup for your svn repos? Do you have one checkout per branch you are interested in? You can do the same with git of course and with git-clone's --reference option you can even share the meat of the different repositories, which is something very nice that I missed in Mercurial or now in Subversion. We can with a relative simple patch platform= to configure avoid 2, but 1 is going to be PITN. Also the symphony branch is missing because it was checked into svn at a non-canonic location so the git-mirror couldn't pick it up. If those branches are changed to normal, the mirror should pick it up. Yes. But I look forward to git's proper author attributions, interactive rebasing, intact individual commits after merges, nice cherry-picks, etc. I think we should have a discussion on the list. I am convinced that git offer some advantages but also some disadvantages (like branch switching) and I feel everybody should have a clear view of pro/con before we decide. +1 Herbert - To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
Re: AOO is now also available as GIT (READ-ONLY).
On 19 December 2013 16:28, Herbert Duerr h...@apache.org wrote: Hello Jan, On 19.12.2013 15:37, jan i wrote: We have anyhow to consider it the GIT branch is a practial solution, I just did a branch switch and encountered 2 problem: 1. The switch alone to 20 minutes A svn switch between two branches takes about the same time, doesn't it? Window's file access is unfortunately quite slow. On Linux or on Mac the filesystems are no bottleneck so checkouts don't take long. The difference (of course I might use git wrongly), is the in svn, the branch is stored in its directory. With git I same disk space (trunk and branches are in 1 directory) but it needs to write a lot of files. 2. I had to rebuilt everything because (in my case) unxlngx6.pro is used for trunk and branch. Well, if trunk and branch are incompatible (i.e. some project wide headers changed, build options changed or there are binary incompatibilites between some libs) then you need clean rebuilds or different output trees regardless of the version control system. Does subversion have some magic that makes such incompatibilities go away? If there is such a magic then that would certainly be nobel price worthy ;-) He, I think it boils down to what I wrote in 1). Git standard keeps trunk/branches in one directory, and for small projects its very fast to switch. I have managed with a trix to have a git trunk in one directory and a git branch in another directory. However when I read the git manual that is not how its supposed to work. But maybe you are using a different setup for your svn repos? Do you have one checkout per branch you are interested in? You can do the same with git of course and with git-clone's --reference option you can even share the meat of the different repositories, which is something very nice that I missed in Mercurial or now in Subversion. I have the setup: /x1/aoo/trunk /x1/aoo/branches so one big aoo directory with everything (I have asked svn to ignore the branches am not interested in). But please bear with me, I am no git expert, just read the manual and try to follow it. rgds jan I. We can with a relative simple patch platform= to configure avoid 2, but 1 is going to be PITN. Also the symphony branch is missing because it was checked into svn at a non-canonic location so the git-mirror couldn't pick it up. If those branches are changed to normal, the mirror should pick it up. Yes. But I look forward to git's proper author attributions, interactive rebasing, intact individual commits after merges, nice cherry-picks, etc. I think we should have a discussion on the list. I am convinced that git offer some advantages but also some disadvantages (like branch switching) and I feel everybody should have a clear view of pro/con before we decide. +1 Herbert - To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
Re: AOO is now also available as GIT (READ-ONLY).
On 19.12.2013 17:38, jan i wrote: On 19 December 2013 16:28, Herbert Duerr h...@apache.org wrote: On 19.12.2013 15:37, jan i wrote: We have anyhow to consider it the GIT branch is a practial solution, I just did a branch switch and encountered 2 problem: 1. The switch alone to 20 minutes A svn switch between two branches takes about the same time, doesn't it? Window's file access is unfortunately quite slow. On Linux or on Mac the filesystems are no bottleneck so checkouts don't take long. The difference (of course I might use git wrongly), is the in svn, the branch is stored in its directory. With git I same disk space (trunk and branches are in 1 directory) but it needs to write a lot of files. Ah, so you were not checking out trunk or branches individually but you conceptually had all of http://svn.apache.org/repos/asf/openoffice/ which contains the website, all branches and trunk. With some trickery you didn't actually check out the directories you were not interested in. So when you built the branches in their individual directories they couldn't interfere. If you like this setup with the individual directories per branch then I suggest to first do a reference clone of our git mirror: git clone --bare git://git.apache.org/openoffice.git aoo.git and then checkout each branch you are interested in, e.g. git clone --reference aoo.git --branch capstone2013 git://git.apache.org/openoffice.git mycapstone2013 You can then work on these individual git branches as you were doing with the svn branches. He, I think it boils down to what I wrote in 1). Git standard keeps trunk/branches in one directory, and for small projects its very fast to switch. Try out the setup I suggested above. There is no need to switch (and rebuild from scratch) if you like it that way. I have managed with a trix to have a git trunk in one directory and a git branch in another directory. However when I read the git manual that is not how its supposed to work. If your preferred workflow uses different directories then THAT's how its supposed to work ;-) But maybe you are using a different setup for your svn repos? Do you have one checkout per branch you are interested in? You can do the same with git of course and with git-clone's --reference option you can even share the meat of the different repositories, which is something very nice that I missed in Mercurial or now in Subversion. I have the setup: /x1/aoo/trunk /x1/aoo/branches so one big aoo directory with everything (I have asked svn to ignore the branches am not interested in). As mentioned above you can have its equivalent in git. Without the ignore-trickery you had to use ;-) But please bear with me, I am no git expert, just read the manual and try to follow it. We'll help each other on the way to a perfect workflow. Herbert - To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
Re: AOO is now also available as GIT (READ-ONLY).
Just keep in mind that there is no support for partial checkouts in git so it’s not all roses and unicorns for a project like this to switch from svn to git. On Dec 18, 2013, at 12:38 PM, jan i j...@apache.org wrote: Hi Infra-5590 has now been solved, thanks to an effort from jfarrell: jfarrell 16:11:32 janIV: christmas gift for you. took a little over a week to wrap, had to use duct tape along the way. git ls-remote git:// git.apache.org/openoffice.git Please have a look at our new READ-ONLY git mirror. Once everybody is happy, we can consider moving fully to GIT, I will however recommend to it imidiatly after next release. rgds jan I. - To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
Re: AOO is now also available as GIT (READ-ONLY).
On 18 December 2013 18:51, Joseph Schaefer joe_schae...@yahoo.com wrote: Just keep in mind that there is no support for partial checkouts in git so it’s not all roses and unicorns for a project like this to switch from svn to git. I my opinion svn offers a number of things superior than git (I have lots of problems with branches in git, when you have a project as big as AOO). I prefer the current solution GIT Readonly for reference, and svn for production, but the majority of the project decides. rgds jan I. On Dec 18, 2013, at 12:38 PM, jan i j...@apache.org wrote: Hi Infra-5590 has now been solved, thanks to an effort from jfarrell: jfarrell 16:11:32 janIV: christmas gift for you. took a little over a week to wrap, had to use duct tape along the way. git ls-remote git:// git.apache.org/openoffice.git Please have a look at our new READ-ONLY git mirror. Once everybody is happy, we can consider moving fully to GIT, I will however recommend to it imidiatly after next release. rgds jan I. - To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
