incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Gavin McDonald" <ga...@16degrees.com.au>
Subject RE: SVN clients: svn, git-svn
Date Mon, 29 Aug 2011 11:10:15 GMT
Great info Michael, someone should make a wiki page of that.

Oh, and I'm not going to make your life easier at all :-

http://git.apache.org/

:)

Open an infra issue if (yeah right) you would like a ooo git clone set up
there.

Gav...


> -----Original Message-----
> From: Michael Stahl [mailto:mst@openoffice.org]
> Sent: Monday, 29 August 2011 9:03 PM
> To: ooo-dev@incubator.apache.org
> Subject: SVN clients: svn, git-svn
> 
> 
> hi all,
> 
> i've checked out the Apache OOo trunk yesterday and committed some
> changes required to build it on my system.
> 
> the official SVN client (version 1.6.17) likes to store every file that is
checked
> out in uncompressed form, which takes a lot of space.
> 
> >  > du -sh trunk/
> > 4,2G	trunk/
> 
> fortunately you don't have to use the official SVN client; there are
unofficial
> clients that are a bit more comfortable, notably HgSubversion and git-svn.
> 
> e.g. install git-svn on Fedora:
> 
> su -c 'yum install git-svn'
> 
> check out the OOo repo like this:
> 
> > git svn clone --username=myapacheid --stdlayout --revision
> > 1162287:HEAD  https://svn-master.apache.org/repos/asf/incubator/ooo/
> 
> notes:
> 
> 1. set up --username correctly!
> 
> 2. if the revision range isn't specified then git-svn will spend a _very_
long
> time looking at all revisions.
> 
> 3. do not use svn.apache.org, but svn-master.apache.org. (see below)
> 
> because git uses data compression this takes much less space (but the
> repacking does takes some time):
> 
> >  > du -sh ooo/
> > 2,3G	ooo/
> 
> now you can commit to the local git repository (but don't merge! git-svn
can't
> handle that).
> 
> if you want to update from the SVN server use "git svn rebase", which will
> also rebase your work on top of the SVN HEAD (conflict resolution may be
> required).
> 
> to push changes to the SVN server use "git svn dcommit"
> 
> 
> Q: so why not use svn.apache.org but svn-master.apache.org?
> 
> this is because svn.apache.org may go to either the master server or a
mirror;
> when i used svn.a.o and "git svn dcommit" to push my changes, there was
> always an error and after every commit i had to manually call "git svn
rebase"
> and then dcommit again (most annoying).  the reason is that the mirror
> synchronization is not instantaneous, and so git-svn gets stale data from
the
> mirror server.
> see also:
> http://web.archiveorange.com/archive/v/WwUr9JnfRyrEj8hOH5jY
> 
> regards,
>  michael
> 



Mime
View raw message