what's the purpose ?http://www.whygitisbetterthanx.com/
what's the purpose ?http://www.whygitisbetterthanx.com/
Does it work OK/reliably on windows?Yes, It's works well.
Main thing to think about : what is currently blocking us with svn, and as such needs to be solved asap.SVN for CB works well until now.
Does it work OK/reliably on windows?Yes, It's works well.
http://code.google.com/p/msysgit/
I've tried git-svn when I started work on the debugger's branch and it was good until the point where I've to generate the patches.You can use gitk to make a patch. In first, you need commit in a branch.
Does it work OK/reliably on windows?Yes, It's works well.
http://code.google.com/p/msysgit/
From what I remember a year ago the GUI tools were really awful and ugly (old tcl/tk stuff look and feel from in the early 90's) [and they were not stable].
is there also something similar like kdesvn ?
is there also something similar like kdesvn ?I'd suggest qgit (http://digilander.libero.it/mcostalba)... based on QT4
I guess it depends on the method you use to get the svn repo in git.What I did was
Depending on this you should read the correct manual, I guess there you'll find something about this.
git svn clone -s http://svn.berlios.de/svnroot/repos/codeblocks local_dir
How long does it take to import the whole repo with the history?Hmmm.... I was in a meeting, so quite not sure, but in the range of one to two hours.
As far as I know you should do rebase if you want to get the changes in the svn repo.Yes, I read that as well, I can rebase to get the svn updated (like an svn update). Haven't tried yet, because there are no new changes on the svn, but will report on that as soon as possible.
And if you do rebase I guess the changes from the first commit to the last are your changes.Sorry, I couldn't follow you here. You mean from my first commit to the local GIT repo to my last commit?
Sorry, I couldn't follow you here. You mean from my first commit to the local GIT repo to my last commit?Yes, something like that. As far as I know rebasing means that all your commits are reverted the commits from svn are applied and then your commits are applied again.
So, I guess this are the steps needed. Btw it is possible to convert all commits to patches with a single command.And the command would be? :-)
git diff-tree -m -p --pretty <commit>
git svn clone -r7548 svn://svn.berlios.de/codeblocks/trunk
You can use TortoiseGIT (http://code.google.com/p/tortoisegit/)+msys-git (http://code.google.com/p/msysgit) combination. They are as good as TortoiseSVN.That, Sir, is the biggest lie of the century. Nice try, though :) (I can't believe I only saw that one today, hehehe.)
Furthermore, msys-git takes almost an hour to install and requires a truly ridiculous amount of harddisk space. Someone who distributes a "little commandline tool" that weights on the order of hundreds of megabytes got something seriously wrong.I am using portable GIT (http://code.google.com/p/msysgit/downloads/detail?name=PortableGit-1.7.7.1-preview20111027.7z&can=2&q=) which you only need to decompress and then it works. In combination with SmartGIT (you guys know meanwhile I love their tools ;-)) it's quite powerful, even the SVN/GIT integration. It offers a very easy way to get a GIT repo out of a SVN repo.
git help gui
Mercurial does not ship with a GUI - TortoiseHg is a separate project.Oh, mine does - it's a TCL/TK based UI and shows the revision tree, differences and stuff like that.Though it's really hidden in the sub-folders of the Windows installation. I don't mean TortoiseXXX. Such things are of no help for me as I never use the explorer.
msys-git is a "true win32 application", and svn integration via "git svn" works perfectly.
Apply it with the patch command and then commit it in your local branch with patches.
can't find file to patch at input line 5
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|Index: src/sdk/editorconfigurationdlg.cpp
|===================================================================
|--- src/sdk/editorconfigurationdlg.cpp (revision 7595)
|+++ src/sdk/editorconfigurationdlg.cpp (working copy)
--------------------------
File to patch:
$ patch -i /...path.../BraceCompletionSelectedText.patch
If you are inside the git's root level, you need most likely the -p0 (or -p1) parameter, and I suggest to always use --dry-run as first to test what would happen, without breaking anything.Apply it with the patch command and then commit it in your local branch with patches.
That's what I was trying to do, but I got the following error messageCodecan't find file to patch at input line 5
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|Index: src/sdk/editorconfigurationdlg.cpp
|===================================================================
|--- src/sdk/editorconfigurationdlg.cpp (revision 7595)
|+++ src/sdk/editorconfigurationdlg.cpp (working copy)
--------------------------
File to patch:
That's my commandCode$ patch -i /...path.../BraceCompletionSelectedText.patch
If you are inside the git's root level, you need most likely the -p0 (or -p1) parameter, and I suggest to always use --dry-run as first to test what would happen, without breaking anything.Thanks jens, the switch -p0 did the trick and I could apply the patch...
I have nothing against GIT itself. Just the combination we do here between SVN and GIT. If we all agree we should consider moving towards GIT completely if most of the devs use it anyways. I recall we were discussing this already, just not why we didn't do it (was it the lack of support from BerliOS?!).
I wonder if some of you already did a migration from SVN to GIT. I mean in terms of keep existing branches and (of course) the whole history...?!
I recall the time when I personally migrated from CVS to SVN. It wasn't easy, but doable if you had the right tools at hand.
That is true. I have nothing against GIT itself. Just the combination we do here between SVN and GIT. If we all agree we should consider moving towards GIT completely if most of the devs use it anyways. I recall we were discussing this already, just not why we didn't do it (was it the lack of support from BerliOS?!).
I wonder if some of you already did a migration from SVN to GIT. I mean in terms of keep existing branches and (of course) the whole history...?!
I recall the time when I personally migrated from CVS to SVN. It wasn't easy, but doable if you had the right tools at hand.
I'm not sure for the hosting, but github sounds like something useful. There is UI to fork projects, request pulls, social stuff...I think we all now the advantages we could take from GIT. However, I would rather not use a third platform if it isn't really necessary. We don't now how well it will be accessible world-wide and would need to connect this repo to our project pages "somehow".
I wonder if some of you already did a migration from SVN to GIT. I mean in terms of keep existing branches and (of course) the whole history...?!???
I wonder if some of you already did a migration from SVN to GIT. I mean in terms of keep existing branches and (of course) the whole history...?!???
I cloned the whole svn repo with git-svn.I think, I've cloned only trunk, but I have the whole history. It took 30-60 minutes.
It holds the whole history since commit 1 to HEAD.
By the way, if I understand it correctly, berlios also offers git since some time:Yes, I know - it just does not have such a "nice" interface like GitHub or alike. But I don't know if we would miss too much.
I guess it is possible to have both repos parrallel, that means switch locally to git, upload and test it, while the svn repo is still available.By the way, if I understand it correctly, berlios also offers git since some time:Yes, I know - it just does not have such a "nice" interface like GitHub or alike. But I don't know if we would miss too much.
Concerning the GIT conversion: I would be mostly interested if your branch switching is reflected properly. For example: The last switch between trunk and the CC branch is important as only in the (backed-up) trunk branch the history is until "day 1".
An if conversion is OK - how would we proceed? Convert locally and upload the a whole converted repo via SSH to BerliOS, or does BerliOS / SourceForge itself offer a migration service? Maybe it wise to setup a dummy project and try before...