Re: [Freeciv-Dev] how to use git locally for freeciv
Am Thursday 02 July 2009 01:19:19 schrieben Sie: On 01/07/2009, Matthias Pfafferodt matthias.pfaffer...@mapfa.de wrote: You don't need to. As I said the 3 GB size is not a problem. I think I will also get warclient and longturn to compare ... The 3 GB is just silly. The entire history of the trunk and S2_1 branches when cloned from freeciv-svn-mirror are only 269M. Perhaps I should simple delete the directory './tags' as git does not use it? This way I'm down to 700MB ... I did a second checkout (using 'git svn clone svn://...) and did get similar numbers. First the './.git' directory is downloaded and after that all tags / branches as well as trunk are checked out. Matthias matth...@mattsys:/home/matthias/git du -h --max-depth=2 2.5G./freeciv.git/tags 251M./freeciv.git/branches 242M./freeciv.git/trunk 208M./freeciv.git/.git 3.2G./freeciv.git 3.2G. どうしてあんまり太っている。 -- Matthias Pfafferodt - http://www.mapfa.de Matthias.Pfafferodt at mapfa.de ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] how to use git locally for freeciv
2009/7/2 Madeline Book madeline.b...@gmail.com: On 01/07/2009, Matthias Pfafferodt matthias.pfaffer...@mapfa.de wrote: You don't need to. As I said the 3 GB size is not a problem. I think I will also get warclient and longturn to compare ... The 3 GB is just silly. The entire history of the trunk and S2_1 branches when cloned from freeciv-svn-mirror are only 269M. I think Matthias has all the branches and tags as separate directories in his harddisk. Madeline's (and mine) git repository just knows that tag is identical to some trunk/branch revision. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] how to use git locally for freeciv
Am Thursday 02 July 2009 23:24:09 schrieb Marko Lindqvist: 2009/7/2 Madeline Book madeline.b...@gmail.com: On 01/07/2009, Matthias Pfafferodt matthias.pfaffer...@mapfa.de wrote: You don't need to. As I said the 3 GB size is not a problem. I think I will also get warclient and longturn to compare ... The 3 GB is just silly. The entire history of the trunk and S2_1 branches when cloned from freeciv-svn-mirror are only 269M. I think Matthias has all the branches and tags as separate directories in his harddisk. Madeline's (and mine) git repository just knows that tag is identical to some trunk/branch revision. - ML This could be; I have git version 1.6.0.2 (from opensuse). Current up-to-date version is v1.6.3.3 ... Matthias -- Matthias Pfafferodt - http://www.mapfa.de Matthias.Pfafferodt at mapfa.de ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] how to use git locally for freeciv
and here is one copy for the list .. Am Wednesday 01 July 2009 01:48:20 schrieben Sie: On 30/06/2009, Matthias Pfafferodt matthias.pfaffer...@mapfa.de wrote: Am Tuesday 30 June 2009 05:06:02 schrieben Sie: On 29/06/2009, Madeline Book madeline.b...@gmail.com wrote: I just made a git repository on gitorious mirroring the trunk branch in gna svn. Try it out: $ git clone git://gitorious.org/freeciv-svn-mirror/freeciv-svn-mirror.git I tried - but I never got to the point there I get the entire repo ;-) matth...@mattsys:/home/matthias/git/test git clone git://gitorious.org/freeciv-svn-mirror/freeciv-svn-mirror.git Initialized empty Git repository in /home/matthias/git/test/freeciv-svn-mirror/.git/ remote: Counting objects: 113273, done. remote: Compressing objects: 100% (18758/18758), done. fatal: The remote end hung up unexpectedly.16 MiB | 19 KiB/s fatal: early EOF fatal: index-pack failed Is it possible to 'restart' the clone process? Hmm I hope I have not exceeded some size/bandwidth limit for the gitorious free service; I did not find any such limit in perusing their site though. Unfortunately when I did a test clone last night it succeeded in one go, so I do not know if it will restart from the beginning if you just reissue the command. In most cases like this I think git is smart enough to pick up where it left off. One minute ago I started todays first try ;-) Will this git mirror be up-to-date? I have to keep it up to date manually by pushing commits from my repository (which has to also manually pull commits from the main svn repository on gna), so it may be up to a few days behind if I do not work on freeciv some days. I guess I could just make a cron script to do that. ;) You don't need to. As I said the 3 GB size is not a problem. I think I will also get warclient and longturn to compare ... Matthias それは我々の任務だ。 -- Matthias Pfafferodt - http://www.mapfa.de Matthias.Pfafferodt at mapfa.de ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] how to use git locally for freeciv
On 01/07/2009, Matthias Pfafferodt matthias.pfaffer...@mapfa.de wrote: You don't need to. As I said the 3 GB size is not a problem. I think I will also get warclient and longturn to compare ... The 3 GB is just silly. The entire history of the trunk and S2_1 branches when cloned from freeciv-svn-mirror are only 269M. どうしてあんまり太っている。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] how to use git locally for freeciv
Am Thursday 18 June 2009 01:50:53 schrieb Madeline Book: On 17/06/2009, Bernd Jendrissek bernd.jendris...@gmail.com wrote: [...] My experience (we did it with git-svn here at work) is that it's a bit of an impedance mismatch; svn's limitations impose limitations on how you use git (I don't know if git-svnimport is any better): merges seem to make SVN go WTF? and freak out. Although I've never tried, I guess you could use a separate branch for each patchset, if you take care with how you bring it back into SVN. I have a branch for each patchset. And it is a one-way data exchange svn - git. The changes are submitted to gna as patches. Until now all is fine ... Separate branches is what I use with git-svn, making a new branch whenever I need to build on changes not yet in the main branch (i.e. trunk, S2_1, etc.). As a contributor one has to submit patches for inspection anyway, so when I do go to commit something, I just checkout the destination branch, apply the previously posted patch file, commit to git, then dcommit with git-svn. Unfortunately since the underlying repo is still svn, we cannot use the powerful branch merging features of git. :( A while ago I wrote a mini intro to using git with freeciv svn: https://mail.gna.org/public/freeciv-dev/2008-03/msg00048.html a size of 350MB? I have more than 3GB, most of it in the directory tags. It's not a problem but do I need this directory? I did a 'git svn clone svn://...' matth...@mattsys:/home/matthias/git du -h --max-depth=2 2.5G./freeciv.git/tags 251M./freeciv.git/branches 242M./freeciv.git/trunk 208M./freeciv.git/.git 3.2G./freeciv.git 3.2G. Matthias Though that was over a year ago and I'm sure that some git commands have changed since then (if something fails check the updated docs). As a matter of convenience I have a separate git repository for S2_1, since there are many autoconf/packet related changes which would require a complete ./autogen.sh make whenever switching to trunk. I also like having a bunch of shell aliases for commonly used command sequences: alias gb='git branch' alias gba='git branch -a' alias gci='git commit -v' alias gco='git checkout' alias gd='git diff' alias gdc='git diff --color' alias gdci='git-svn dcommit' alias gl='git log' alias glt='git log --pretty=format:%s%n%n%b' alias gps='git push' alias gpu='git pull' alias gr='git reset' alias greb='git-svn rebase' alias gsh='git show' alias gshc='git show --stat -p --color' alias gst='git status' Using git branches is much more space efficient than copying the svn repo each time, and incomparably faster. This was actually the main reason I learned to use git a long time, though git has many more advantages beyond just that. ;) あなたも同化される。 -- Matthias Pfafferodt - http://www.mapfa.de Matthias.Pfafferodt at mapfa.de ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] how to use git locally for freeciv
On 29/06/2009, Matthias Pfafferodt matthias.pfaffer...@mapfa.de wrote: Am Thursday 18 June 2009 01:50:53 schrieb Madeline Book: On 17/06/2009, Bernd Jendrissek bernd.jendris...@gmail.com wrote: [...] My experience (we did it with git-svn here at work) is that it's a bit of an impedance mismatch; svn's limitations impose limitations on how you use git (I don't know if git-svnimport is any better): merges seem to make SVN go WTF? and freak out. Although I've never tried, I guess you could use a separate branch for each patchset, if you take care with how you bring it back into SVN. I have a branch for each patchset. And it is a one-way data exchange svn - git. The changes are submitted to gna as patches. Until now all is fine ... Separate branches is what I use with git-svn, making a new branch whenever I need to build on changes not yet in the main branch (i.e. trunk, S2_1, etc.). As a contributor one has to submit patches for inspection anyway, so when I do go to commit something, I just checkout the destination branch, apply the previously posted patch file, commit to git, then dcommit with git-svn. Unfortunately since the underlying repo is still svn, we cannot use the powerful branch merging features of git. :( A while ago I wrote a mini intro to using git with freeciv svn: https://mail.gna.org/public/freeciv-dev/2008-03/msg00048.html a size of 350MB? I have more than 3GB, most of it in the directory tags. It's not a problem but do I need this directory? I did a 'git svn clone svn://...' matth...@mattsys:/home/matthias/git du -h --max-depth=2 2.5G./freeciv.git/tags 251M./freeciv.git/branches 242M./freeciv.git/trunk 208M./freeciv.git/.git 3.2G./freeciv.git 3.2G. Something is strange, since I have the full repository, with all my local branches and all remote branches and tags in 341 MB as of today (with git-repack -a -d and make distclean with 'trunk' checked out). My directory layout is different, I only have one directory (I call it 'git-svn'), in which there is a '.git' dir of 148M (du -h -s . inside) and the currently checked out source within it (i.e. no separate 'tags', 'branches' and 'trunk' directories, e.g. 'autogen.sh' is just in 'git-svn'). Maybe despite what the documentation says, git-svn clone behaves differently from running git-svn init and git-svn fetch separately. Or maybe you have an old version of git or git-svn that behaves that way. $ git-svn --version git-svn version 1.6.3.1 (svn 1.5.1) Anyway, the commands I used (in the directory you want to be the root of the repository, like 'git-svn' above) are: $ git svn init -t tags -b branches -T trunk --prefix=gna/ svn://svn.gna.org/svn/freeciv $ git svn fetch (It will take a long time to fetch all the revisions, just do the command again if it is interrupted by you or something else. Maybe you will need a while ! git svn fetch; sleep 5; done or similar for your shell. ;)) (I'm also not sure if you should use 'svn+ssh://synt...@svn.gna...' instead of just plain 'svn://svn.gna...', since I do not know if you will have to re-fetch the whole damn thing if you were to get svn write access some day...) $ git-repack -a -d $ git config branch.autosetupmerge true $ git-checkout trunk gna/trunk $ git-svn rebase Now you should be all set. I have no idea why your repository is so huge. It looks like it somehow copied the entire svn repository, and then just added a .git directory at its root. You do not need all of that, the laborious svn fetch should have grabbed all of the necessary information and converted it into git form. I hope I'm not crazy/stupid. ;) 信じられねぇぇ！ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] how to use git locally for freeciv
I just made a git repository on gitorious mirroring the trunk branch in gna svn. Try it out: $ git clone git://gitorious.org/freeciv-svn-mirror/freeciv-svn-mirror.git Web page: http://gitorious.org/freeciv-svn-mirror It should be a bit faster than via git-svn. ;) そのおもちゃを見せてくれ。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] how to use git locally for freeciv
On 29/06/2009, Madeline Book madeline.b...@gmail.com wrote: I just made a git repository on gitorious mirroring the trunk branch in gna svn. Try it out: $ git clone git://gitorious.org/freeciv-svn-mirror/freeciv-svn-mirror.git And when that finishes do $ git-checkout -b trunk origin/trunk in the newly created directory (freeciv-svn-mirror). Sorry, I think I had a mistake in the git-checkout example step in my previous mail: I forgot the -b argument to create a new branch. ただの枝だ。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] how to use git locally for freeciv
Hello, at the moment I use svn to work with the freeciv code. For each patchset I create a copy of the svn repo using 'cp -lr'. It is not the best way but working ... How would I'm using git (my own local git repo) for the freeciv source code? I found git-svnimport and also more than enough web sides to explain git. But how to handle different patchsets? Create a new branch for each? Up to now I used cvs on my own projects (only one user) but with the freeciv code it is kind of confusing, especially rebasing to the up-to-date svn. Thanks for help Matthias Pfafferodt -- Matthias Pfafferodt - http://www.mapfa.de Matthias.Pfafferodt at mapfa.de ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] how to use git locally for freeciv
On 17/06/2009, Bernd Jendrissek bernd.jendris...@gmail.com wrote: On Thu, Jun 18, 2009 at 12:54 AM, Matthias Pfafferodtmatthias.pfaffer...@mapfa.de wrote: at the moment I use svn to work with the freeciv code. For each patchset I create a copy of the svn repo using 'cp -lr'. It is not the best way but working ... How would I'm using git (my own local git repo) for the freeciv source code? I found git-svnimport and also more than enough web sides to explain git. But how to handle different patchsets? Create a new branch for each? Up to now I used cvs on my own projects (only one user) but with the freeciv code it is kind of confusing, especially rebasing to the up-to-date svn. My experience (we did it with git-svn here at work) is that it's a bit of an impedance mismatch; svn's limitations impose limitations on how you use git (I don't know if git-svnimport is any better): merges seem to make SVN go WTF? and freak out. Although I've never tried, I guess you could use a separate branch for each patchset, if you take care with how you bring it back into SVN. Separate branches is what I use with git-svn, making a new branch whenever I need to build on changes not yet in the main branch (i.e. trunk, S2_1, etc.). As a contributor one has to submit patches for inspection anyway, so when I do go to commit something, I just checkout the destination branch, apply the previously posted patch file, commit to git, then dcommit with git-svn. Unfortunately since the underlying repo is still svn, we cannot use the powerful branch merging features of git. :( A while ago I wrote a mini intro to using git with freeciv svn: https://mail.gna.org/public/freeciv-dev/2008-03/msg00048.html Though that was over a year ago and I'm sure that some git commands have changed since then (if something fails check the updated docs). As a matter of convenience I have a separate git repository for S2_1, since there are many autoconf/packet related changes which would require a complete ./autogen.sh make whenever switching to trunk. I also like having a bunch of shell aliases for commonly used command sequences: alias gb='git branch' alias gba='git branch -a' alias gci='git commit -v' alias gco='git checkout' alias gd='git diff' alias gdc='git diff --color' alias gdci='git-svn dcommit' alias gl='git log' alias glt='git log --pretty=format:%s%n%n%b' alias gps='git push' alias gpu='git pull' alias gr='git reset' alias greb='git-svn rebase' alias gsh='git show' alias gshc='git show --stat -p --color' alias gst='git status' Using git branches is much more space efficient than copying the svn repo each time, and incomparably faster. This was actually the main reason I learned to use git a long time, though git has many more advantages beyond just that. ;) あなたも同化される。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
