A Git Repository for Code::Blocks (ONLY trunk)

[reckless]

Hmm true git's gui is tcl and while not the most advanced it does what it needs to but needs a bash shell to work, qgit might be a better alternative though it lacks some documentation.
Git can be build with mingw as a true win32 application but there are some downfalls like getting svn integration to work.
I got a win32 build you can test if you want ? (it uses qgit gui svn support is not in yet) it works with standard git repositories though.
Its also a lot smaller than msys-git.

[zabzonk]

>Git can be build with mingw as a true win32 application but there are some downfalls like getting svn integration to work.

msys-git is a "true win32 application", and svn integration via "git svn" works perfectly.

[MortenMacFly]

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.

[reckless]

msys-git is a "true win32 application", and svn integration via "git svn" works perfectly.

I mean it relies on a posix layer (msys-1.0.dll) the mingw one only needs what dll's are allready on windows + a few things like curl.
Im working on getting the tcl gui to use the windows tclsh directly instead of through bash.
Msys-git works fine no argument there its just a little large so im trying to cut some fat.

[daniloz]

Another question here...

How do I use a patch generated by SVN on my local git svn ?

[oBFusCATed]

Apply it with the patch command and then commit it in your local branch with patches.

[daniloz]

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 message

Code Select Expand


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:


That's my command

Code Select Expand


$ patch -i /...path.../BraceCompletionSelectedText.patch


[Jenna]

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 message

Code Select Expand


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:


That's my command

Code Select Expand


$ 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.

[daniloz]

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...

[ollydbg]

There is some new discussion of git. see:
Re: Integrate the nativeparser_base to our parsertest project

Said by Morten:

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.

So, we can discuss this issue here.

[oBFusCATed]

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.

If there is a voting now, I'd vote for switching to git as it makes open source development a lot easier. (I've only used git-svn, but I'm sure it does).
Switching to git will make it easier to test things and to follow other developers, as everybody can publish their work-in-progress in separate branches.

I'm not sure for the hosting, but github sounds like something useful. There is UI to fork projects, request pulls, social stuff...

[MortenMacFly]

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".

If BerliOS or SourceForge offer similar functionality (or less, if that is still enough) I clearly vote for those platforms. Also - still most important to me:

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...?!

???

[Jenna]

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.
It holds the whole history since commit 1 to HEAD.


It still uses git-svn, so it is not a real git repo, but there exist scripts and many, many guides that help to really switch to git.
I will try it this weekend.

By the way, if I understand it correctly, berlios also offers git since some time:
http://developer.berlios.de/docman/display_doc.php?docid=1812&group_id=2

[oBFusCATed]

I cloned the whole svn repo with git-svn.
It holds the whole history since commit 1 to HEAD.

I think, I've cloned only trunk, but I have the whole history. It took 30-60 minutes.

[MortenMacFly]

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...