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
