Code::Blocks

Developer forums (C::B DEVELOPMENT STRICTLY!) => Development => Topic started by: Biplab on March 16, 2012, 07:29:15 am

Title: Read-only Git, SVN Repo for Code::Blocks
Post by: Biplab on March 16, 2012, 07:29:15 am
I’m hosting a read-only mirror of Code::Blocks repo on my server. This will give read-only access to everyone. I’m also hosting a read-only Git repo. This will give us access to Git repo to everyone who loves Git (including myself).

You can check out source via svn by issuing the following command-
Code: [Select]
svn checkout svn://cb.biplab.in/codeblocks/trunk
You can browse svn repo using WebSVN interface at the following url-
Quote
http://cb.biplab.in/websvn/

You can clone git repo by issuing following command-
Code: [Select]
git clone git://cb.biplab.in/codeblocks.git
You can browse git repo, download source tarball at the following url-
Quote
http://cb.biplab.in/cgit/

These repos are refreshed every 30 minutes. So if you find that my repo is not updated, then try again after sometime.

If you face any issue accessing any repo, please let me know.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: LETARTARE on March 16, 2012, 09:48:37 am
@Biplab
Well thank you for this new link.
I just downloaded in 'SVN' and everything went well.
good day
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on June 07, 2012, 04:47:46 am
@biplab
Your site is down???

EDIT: It works OK now.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: Biplab on June 28, 2012, 05:59:24 pm
@biplab
Your site is down???

EDIT: It works OK now.

@ollydbg,

I noticed your post very late.

Yes, server went down couple of times this month. The last one happened yesterday. On all occasions it was hard reboots which crashed my server. Sometimes I receive server reboot notification mid night or when I'm at work; this prolongs server downtime.

I'm keeping an eye on the situation and may move it to a different host if situation deteriorates.

Please feel free to PM me if you notice it down. :)
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on April 16, 2013, 03:10:00 am
Hi, Biplab, is it possible the GIT synchonize the SVN log message change such as the one I did in
http://forums.codeblocks.org/index.php/topic,17574.msg121792.html#msg121792
Thanks
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: Biplab on April 16, 2013, 03:24:44 am
Hi, Biplab, is it possible the GIT synchonize the SVN log message change such as the one I did in
http://forums.codeblocks.org/index.php/topic,17574.msg121792.html#msg121792
Thanks

It may be possible. I'll do it later today. :)
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: oBFusCATed on April 16, 2013, 09:41:44 am
It may be possible. I'll do it later today. :)
But this will mean that you'll change the history, which is not a good practice and causes lots of pain.  ::)
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: Biplab on April 16, 2013, 03:18:42 pm
But this will mean that you'll change the history, which is not a good practice and causes lots of pain.  ::)
I love to rewrite history. ;D

Hi, Biplab, is it possible the GIT synchonize the SVN log message change such as the one I did in
http://forums.codeblocks.org/index.php/topic,17574.msg121792.html#msg121792
Thanks
SF repo still shows your old commit message. No changes were made to that. As a mirror I'll leave the commit message same as source. :)
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on April 16, 2013, 04:08:20 pm

Hi, Biplab, is it possible the GIT synchonize the SVN log message change such as the one I did in
http://forums.codeblocks.org/index.php/topic,17574.msg121792.html#msg121792
Thanks
SF repo still shows your old commit message. No changes were made to that. As a mirror I'll leave the commit message same as source. :)
Yes, I do see the SF repo still have old messages
http://sourceforge.net/p/codeblocks/code/8855/log/?path=
But my local svn log was changed, see screen shot below:
(http://i.imgur.com/l4BXu3i.png)

Question: I can edit the log message by TortoiseSVN, after that, do I need to do any thing like run a commit? Actually I did not run any commit after changing the log message.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: Biplab on April 16, 2013, 05:30:49 pm
Question: I can edit the log message by TortoiseSVN, after that, do I need to do any thing like run a commit? Actually I did not run any commit after changing the log message.

Do you have appropriate access to repo? AFAIK, you need special access to change commit log.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on April 17, 2013, 01:51:20 am
Do you have appropriate access to repo? AFAIK, you need special access to change commit log.
I don't have special access, just normal developer R/W access to SF repo.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: jens on April 17, 2013, 06:26:53 am
If I understand it correcty, the change of the log-entry is in fact a property change.
ANd such changes have normally to be committed explicitely.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on April 17, 2013, 07:01:17 am
If I understand it correcty, the change of the log-entry is in fact a property change.
ANd such changes have normally to be committed explicitely.
Thanks, but currently I don't find any option in TortoiseSVN that let me commit such property change. :)
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: MortenMacFly on April 17, 2013, 07:36:52 am
Do you have appropriate access to repo? AFAIK, you need special access to change commit log.
Nope, not at all. I've setup a general hook that does not depend on user rights (although it would be possible to do that, too).

Also, a log change does not require an explicit commit - its done directly.

BUT: Your SVN software needs to re-cache the log messages. As these are usually stored locally to save bandwidth, you need to ensure they get re-freshed. For me this is done automatically, for TortoiseSVN this may not be the case. The easiest (but brute-force) way would be do delete the SVN log cache for the particular repo. Then it will be re-built completely.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: oBFusCATed on April 17, 2013, 09:57:37 am
Also, a log change does not require an explicit commit - its done directly.
And it my opinion this is the reason this feature should be disabled. A person can destroy the history and we won't know about it. Good luck in restoring it back.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: Biplab on April 17, 2013, 02:35:37 pm
Also, a log change does not require an explicit commit - its done directly.
And it my opinion this is the reason this feature should be disabled. A person can destroy the history and we won't know about it. Good luck in restoring it back.

I second oBFusCATed. This feature should not be enabled on our repo.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: MortenMacFly on April 17, 2013, 04:02:19 pm
A person can destroy the history and we won't know about it.
Nope - how would you want to do that?

Well we should trust each other at least that much that we don't select >8000 commits and change their commit log. Its only possible for one entry at a time and is an atomic operation. So it cannot interfere with any other operation.

So: Do you think we need to disabled it because one of us well be that bad to change all our logs one-by-one? If so, we can close commits all-together, cause you could also just commit bad stuff.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: oBFusCATed on April 17, 2013, 04:54:34 pm
If so, we can close commits all-together, cause you could also just commit bad stuff.
Yes, but we can revert them, because we have the old state or the repo. With this option there is not way to revert the change.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: MortenMacFly on April 18, 2013, 10:15:05 am
With this option there is not way to revert the change.
Well you still have a backup.

But again: Why would you want to do that? Its enabled that you can change your own commit messages if you made a mistake and maybe before a release to auto-process changelogs more easily. Thats convenient enough I'd say. And I already changed some of my mistakes in the SVN log which made me happy. You want to see me happy, don't you?! :-)
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on April 18, 2013, 10:25:29 am
With this option there is not way to revert the change.
Well you still have a backup.
Where is the backup? A GIT mirror?
Quote
But again: Why would you want to do that? Its enabled that you can change your own commit messages if you made a mistake and maybe before a release to auto-process changelogs more easily. Thats convenient enough I'd say. And I already changed some of my mistakes in the SVN log which made me happy. You want to see me happy, don't you?! :-)
Good to see that One can only change his own committed message. :)

BTW: I tried many times, many options (include disable cashing) under TortoiseSVN, but all failed, so I'm going to try SVN command line. :(
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: MortenMacFly on April 18, 2013, 02:37:22 pm
Where is the backup? A GIT mirror?
A SVN dump made all night directly as SF.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on April 18, 2013, 03:48:58 pm
SVN command line show that the log message are already changed:
Quote
E:\code\cb\cb_trunk_sf>which svn
D:\Program Files\TortoiseSVN\bin\svn.EXE

E:\code\cb\cb_trunk_sf>svn log -r 8855
------------------------------------------------------------------------
r8855 | ollydbg | 2013-02-25 13:00:49 +0800 (星期一, 25 二月 2013) | 1 line

* exchndl: link libz instread of libintl, thus implement the Feature Request #55
17. Add checking winnt.h macros for both MinGW and MinGW-W64. Workaround a #erro
r in bfd.h.
------------------------------------------------------------------------

E:\code\cb\cb_trunk_sf>


But I still see http://sourceforge.net/p/codeblocks/code/8855/ shows:
Quote
exchndl: link libz instread of libiberty, thus implement the Feature Request #5517. Check winnt.h for both MinGW and MinGW-W64. Workaround a #error in bfd.h.

So, any one can help me?
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: jens on April 19, 2013, 09:53:22 am
It looks like sourceforge caches (at least) the history-entries and do not update them if they get changed.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on April 19, 2013, 10:36:10 am
I post a Ticket in SF, see: https://sourceforge.net/p/forge/site-support/3691/
Hope they can fix it.

EDIT: It looks like SF guys will look into it soon, see the IRC messages.
Quote
   ollydbg   Anyone encountered a problem that I change the SVN log message for one revision, but the SF repo does not update this message, thanks.
   wjp   can you be more specific?
   ollydbg   Hi, wjp, thanks.
   ollydbg   I'm a developer of Codeblocks.
   ollydbg   Then, I found that one commit of mine has some typos, so I try to change the log message under TortoiseSVN. Just click on one revision's log message, then select the change log message menu.
   ollydbg   So, I can successfully change the log message. Yes, we have already enabled the svn-hook in SF site, so this let our Codeblocks change log message.
   ollydbg   But when I look at the SF svn web page, it still show the old log message, so I suspect it was some bug on SF. (AS we have discussed this issue for two days, other Codeblocks also suspect it was a bug of SF), does any one encountered the same issue like me? Thanks.
   -->|   mlohr ([email protected]) has joined #sourceforge
   ollydbg   You can read my post in this post from Codeblocks forum: http://forums.codeblocks.org/index.php/topic,16096.msg121965.html#msg121965, here you see different message from my local svn log command and the SF svn web page.
   ollydbg   I have also create a Ticket in SF minutes ago, see: https://sourceforge.net/p/forge/site-support/3691/
   ollydbg   Thanks.
   wjp   if you had the pre-revprop hook already, that does sound like a probable SF issue. It's still outside of ,,businesshours , but someone from SF should be in soon
   gribble   Sourceforge.net business hours are approximately 12:00 to 21:00 UTC, excluding weekends and holidays. Currently, it is Fri Apr 19 08:45:17 2013 UTC.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: MortenMacFly on April 20, 2013, 09:15:09 am
It looks like sourceforge caches (at least) the history-entries and do not update them if they get changed.
I am not so sure about that - for me it worked instantaneously. I would believe its more a bug with TortoiseSVN... or feature.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: jens on April 20, 2013, 09:21:27 am
It looks like sourceforge caches (at least) the history-entries and do not update them if they get changed.
I am not so sure about that - for me it worked instantaneously. I would believe its more a bug with TortoiseSVN... or feature.
No, surely not, becuase in svn it's changed (as svn-log shows), but sf's websvn does not sgow the changes.
In other word the webserver shows another comment than the real svn-client.
That is surely a bug in sf's software.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: stahta01 on April 20, 2013, 09:36:48 am
From http://sourceforge.net/p/codeblocks/code/8855/ (http://sourceforge.net/p/codeblocks/code/8855/)

Quote
exchndl: link libz instread of libintl, thus implement the Feature Request #5517. Add checking winnt.h macros for both MinGW and MinGW-W64. Workaround a #error in bfd.h.

Are you sure its NOT a local PC browser save issue?
Or maybe it just takes a while to be fixed to make to Web Server? (Web server updates the log on a hourly or daily basis type issue.)
Or did the fix it just a few minutes ago?

Tim S.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: jens on April 20, 2013, 09:43:12 am
It's there now, but was not yesterday, with empty browser cache.

Such webservices can use local caches, but such a cache might not always work correctly

Looking at the ticket (http://sourceforge.net/p/forge/site-support/3691/) opened by ollydbg, it seems it was fixed by sf-maintainers.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: Alpha on July 03, 2013, 03:35:20 pm
Biplab, is it possible to make the age column in your mirror (http://cb.biplab.in/websvn/log.php?repname=codeblocks&path=%2F&isdir=1&) look more like it does on berliOS (http://svn.berlios.de/wsvn/enigma-game/?op=log&isdir=1&)?
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: Biplab on July 03, 2013, 04:08:40 pm
Biplab, is it possible to make the age column in your mirror (http://cb.biplab.in/websvn/log.php?repname=codeblocks&path=%2F&isdir=1&) look more like it does on berliOS (http://svn.berlios.de/wsvn/enigma-game/?op=log&isdir=1&)?

Done. :)
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: LETARTARE on September 08, 2013, 05:15:18 pm
last few days :

Quote
svn checkout svn://cb.biplab.in/codeblocks/trunk Cb_Biplab-new
svn: E730061: Unable to connect to a repository at URL 'svn://cb.biplab.in/codeblocks/trunk'

I use this address for a long time and to day indicates a refusal !!
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: Biplab on September 08, 2013, 06:56:51 pm
@LETARTARE,

That server got restarted and svn server daemon didn't start-up correctly. As a result svn server was inaccessible. I have restarted it and you can use it now.

Regards,

Biplab
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: LETARTARE on September 08, 2013, 07:05:51 pm
Thank you, it's ok.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on November 13, 2013, 01:55:56 am
Hi, biplab, did you re-create the git mirror?
Today, I try to run the git pull, but I see a new fresh clone comes:
Quote
git.exe pull -v --progress       "origin" master

warning: no common commits
remote: Counting objects: 93778, done.
remote: Compressing objects: 100% (18967/18967), done.
Receiving objects: 100% (93778/93778), 52.53 MiB | 195.00 KiB/s, done.
Resolving deltas: 100% (76113/76113), done.
remote: Total 93778 (delta 76113), reused 90789 (delta 73547)
From git://codeblocks.biplab.in/codeblocks
* branch            master     -> FETCH_HEAD
+ 89aae22...500e38d master     -> origin/master  (forced update)
...
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on November 13, 2013, 04:55:25 am
Compared to OBF's git in https://github.com/obfuscated/codeblocks_sf/commits/master
I see that the log message has changed, I don't see the SVN revision number in Biplab's git log messages now.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: Biplab on November 13, 2013, 06:01:58 am
Hi, biplab, did you re-create the git mirror?
Today, I try to run the git pull, but I see a new fresh clone comes:

Unfortunately yes. Cron job started to fail after a new branch was created. I didn't get time to look at it due to my business trips. I'll review it over the weekend after I return home.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: Biplab on November 18, 2013, 07:16:51 pm
Unfortunately yes. Cron job started to fail after a new branch was created. I didn't get time to look at it due to my business trips. I'll review it over the weekend after I return home.

@Ollydbg,

I have fixed the git server error. I have also restored original behaviour, i.e., it now contains svn commit numbers.


Also I want to highlight that both SVN and Git repo are updated at 10 minutes interval since last year.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on November 21, 2013, 03:31:28 pm
Unfortunately yes. Cron job started to fail after a new branch was created. I didn't get time to look at it due to my business trips. I'll review it over the weekend after I return home.

@Ollydbg,

I have fixed the git server error. I have also restored original behaviour, i.e., it now contains svn commit numbers.


Also I want to highlight that both SVN and Git repo are updated at 10 minutes interval since last year.

Thanks.

Is there any way I can delete the wrong commits in my local clone. Currently in my local clone, I have mainly two log trees(one with svn revision in the log message, one without it).

Another question is: Is it possible to direct use your git repo to develop C::B, I mean it takes several hours to use git-svn to check out all the svn data locally, I just want to create a local git branch, then I can use git-svn to commit the change to the svn repo.

Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 21, 2013, 10:45:33 am
It looks like the git mirror is broken again. :(

EDIT: Biplab's git clone works OK, I found that I have use an old(wrong) git clone before the fix (Re: Read-only Git, SVN Repo for Code::Blocks (http://forums.codeblocks.org/index.php/topic,16096.msg127301.html#msg127301)), sorry about the noise.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: jens on December 21, 2013, 10:57:31 am
I just played with cgit to make it usable with nginx and uwsgi.
To test it I created a test repo (also readonly) including C::B and wxWidgets in http://cgit.jenslody.de (http://cgit.jenslody.de).

I did not convert all branches and tags to git, just trunk and the actual revisions.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 21, 2013, 11:48:53 am
I just played with cgit to make it usable with nginx and uwsgi.
To test it I created a test repo (also readonly) including C::B and wxWidgets in http://cgit.jenslody.de (http://cgit.jenslody.de).

I did not convert all branches and tags to git, just trunk and the actual revisions.
Thanks.
Will try it now.

Is it possible to use this git clone, and then after some development, commit back to our official SVN repo?
(git-svn to check out all the SVN history takes too long time, so I would like to use some git clone directly)
Thanks.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: jens on December 21, 2013, 11:57:59 am
Is it possible to use this git clone, and then after some development, commit back to our official SVN repo?
(git-svn to check out all the SVN history takes too long time, so I would like to use some git clone directly)
Thanks.
I don't think so, because if you use just git to clone, you do not get the svn-information.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 21, 2013, 12:03:13 pm
Is it possible to use this git clone, and then after some development, commit back to our official SVN repo?
(git-svn to check out all the SVN history takes too long time, so I would like to use some git clone directly)
Thanks.
I don't think so, because if you use just git to clone, you do not get the svn-information.
Thanks. I see your git is mirrored from the SVN reop(have svn information, at least in the log message), so if I clone your git repo, that information is also contained.

BTW: Let me ask such question on Stackoverflow.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: jens on December 21, 2013, 12:06:50 pm
Is it possible to use this git clone, and then after some development, commit back to our official SVN repo?
(git-svn to check out all the SVN history takes too long time, so I would like to use some git clone directly)
Thanks.
I don't think so, because if you use just git to clone, you do not get the svn-information.
Thanks. I see your git is mirrored from the SVN reop(have svn information, at least in the log message), so if I clone your git repo, that information is also contained.

BTW: Let me ask such question on Stackoverflow.
But the real svn-information is missing (svn-subfolder in the .git-directory).
You can try to download http://apt.jenslody.de/downloads/codeblocks.git.tar.xz (http://apt.jenslody.de/downloads/codeblocks.git.tar.xz).
That's the whole packed .git-folder of my C::B-mirror.
If you unpack it you should have the whole git-svn clone with actual revisions from today.
It's an anonymous checkout, so to use it for commit you probably have to switch the (base-)url.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 21, 2013, 02:32:29 pm
Thanks Jens, I have download your codeblocks.git.tar.xz, but in-fact I don't have much knowledge to handle this.

Refer to some questions and answers from Stackoverflow, such as:
http://stackoverflow.com/questions/268736/git-svn-whats-the-equivalent-to-svn-switch-relocate
http://www.sanityinc.com/articles/relocating-git-svn-repositories/

It looks like the SHA number is depend on the SVN URL of the repo.

For example, I have a partial clone(not the full svn history, just some revisions since 2013 May) of our svn repo, the last commit show is:
Code: [Select]
SHA-1: 19da0597d2f93510a79d58126ee8b816ac58706d

* * compiler: fix MinGW auto detection, we actually distribute 'mingw32-make' (not 'make')

git-svn-id: https://svn.code.sf.net/p/codeblocks/code/[email protected] 2a5c6006-c6dd-42ca-98ab-0921f2732cef

Now, I read this information from your cgit web interface:  http://cgit.jenslody.de/codeblocks/commit/?id=a8fd2cf9415f205012f5389fde815a867061924b

Code: [Select]
author alpha0010 <[email protected]> 2013-12-16 16:21:24 (GMT)
committer alpha0010 <[email protected]> 2013-12-16 16:21:24 (GMT)
commit a8fd2cf9415f205012f5389fde815a867061924b (patch)
tree 95187bd26694326a05809d029ffe0838e41d88bc
parent f2595380d8339b12d58bcf4be63e61244304e311 (diff)
download codeblocks-a8fd2cf9415f205012f5389fde815a867061924b.tar.bz2
codeblocks-a8fd2cf9415f205012f5389fde815a867061924b.tar.xz
* compiler: fix MinGW auto detection, we actually distribute 'mingw32-make' (not 'make')HEADmaster
git-svn-id: http://svn.code.sf.net/p/codeblocks/code/[email protected] 2a5c6006-c6dd-42ca-98ab-0921f2732cef

From biplab's cgit page: http://cb.biplab.in/cgit/codeblocks/commit/
Code: [Select]
author Alpha 2013-12-16 16:21:24 (GMT)
committer Alpha 2013-12-16 16:21:24 (GMT)
commit 313b1688b4e96cd2e2eb7fab4c7c1404c5d99eb8 (patch)
tree 95187bd26694326a05809d029ffe0838e41d88bc
parent 8b5ad1b3301805ada8aa26500ce29e226fa07d23 (diff)
download codeblocks-master.zip
codeblocks-master.tar.gz
codeblocks-master.tar.bz2
* compiler: fix MinGW auto detection, we actually distribute 'mingw32-make' (not 'make')HEADmaster
git-svn-id: svn://svn.code.sf.net/p/codeblocks/code/[email protected] 2a5c6006-c6dd-42ca-98ab-0921f2732cef

We have different URLs, for me, I need to use the URL support write access, so I use https, yours is http, and biplab is svn.


BTW: I have check OBF's

Here, in SVN 9482, it is https://github.com/obfuscated/codeblocks_sf/commit/4a62342a9b7089a399d88d13e239b10cb0e562a1
Code: [Select]
* reverted revision 9482, as it is not working under Windows

git-svn-id: https://svn.code.sf.net/p/codeblocks/code/[email protected] 2a5c6006-c6dd-42ca-98ab-0921f2732cef

and mine is:
Code: [Select]
SHA-1: 0f5e0bf3386695c15051c922b67f4e7b72151215

* * reverted revision 9482, as it is not working under Windows

git-svn-id: https://svn.code.sf.net/p/codeblocks/code/[email protected] 2a5c6006-c6dd-42ca-98ab-0921f2732cef

Look, we have different SHA number even we have same SVN URL.  :(



Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: oBFusCATed on December 21, 2013, 02:53:36 pm
The SHA depends on the parent commit's SHA, so if the parent has different SHA the child is different, too.
I guess the histories in our repos are different, so we have different SHAs.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 21, 2013, 03:03:58 pm
The SHA depends on the parent commit's SHA, so if the parent has different SHA the child is different, too.
I guess the histories in our repos are different, so we have different SHAs.
If this is the reason, then I think I can clone your git repo(I suppose your git-svn has a full svn revisions, starting from svn rev 0), then I can use it to commit back to the SVN(https://svn.code.sf.net/p/codeblocks/code/trunk).

But I think that your git repo synchronize with the svn by hand? (not automatically?)

EDIT:
The main point is that I can have a C::B git clone(at least have the full trunk history), which I can use to directly commit back to the C::B SVN repo.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 21, 2013, 03:25:05 pm
FYI: Biplab's git mirror works OK, it's by my fault that use a wrong(unfixed) git, so today I run git pull command, it just fetch the whole good data again. I have updated my post here: Re: Read-only Git, SVN Repo for Code::Blocks (http://forums.codeblocks.org/index.php/topic,16096.msg128118.html#msg128118).
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 21, 2013, 03:40:28 pm
I found a useful webpage, which looks like to show the steps to handle the same problem(git-svn takes too long time to mirror a whole svn repo) of mine.

http://trac.parrot.org/parrot/wiki/git-svn-tutorial

Quote
.......
From the leto's github mirror

Because importing all of history is *very* time consuming, DukeLeto has already gone through the trouble and maintains a github mirror of Parrot at  http://github.com/leto/parrot/tree/upstream .

    git clone git://github.com/leto/parrot.git

.......
Adding git-svn metadata to the github clone
.......


Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: oBFusCATed on December 21, 2013, 03:45:30 pm
But I think that your git repo synchronize with the svn by hand? (not automatically?)
Yes, but if your git svn is working you can always run "git svn rebase" to synchronize with svn and then do "git svn dcommit".
I can probably add some automatic synchronization to my repo if there is interest. I've not bothered to research how to do it, yet.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 22, 2013, 07:29:05 am
But I think that your git repo synchronize with the svn by hand? (not automatically?)
Yes, but if your git svn is working you can always run "git svn rebase" to synchronize with svn and then do "git svn dcommit".
I can probably add some automatic synchronization to my repo if there is interest. I've not bothered to research how to do it, yet.
Yes, an automatic synchronization method is great!

@Jen:
I try to use your achieve file, and found some issue, see the log:
Code: [Select]
I just run the command:

[email protected] /f/jens-codeblocks-mirror
$ tar xvfJ ./codeblocks.git.tar.xz
...

[email protected] /f/jens-codeblocks-mirror/codeblocks.git
$ git reset --hard HEAD
Checking out files: 100% (5639/5639), done.
HEAD is now at a8fd2cf * compiler: fix MinGW auto detection, we actually distrib                                                            ute 'mingw32-make' (not 'make')

[email protected] /f/jens-codeblocks-mirror/codeblocks.git
$ git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   debian/codeblocks-contrib.postinst
#       modified:   debian/codeblocks.postinst
#       modified:   src/exchndl.dll
#       modified:   src/mac_pack
#       modified:   src/plugins/contrib/SpellChecker/hunspell/config.guess
#       modified:   src/plugins/contrib/SpellChecker/hunspell/config.rpath
#       modified:   src/plugins/contrib/SpellChecker/hunspell/config.sub
#       modified:   src/plugins/contrib/SpellChecker/hunspell/configure
#       modified:   src/plugins/contrib/SpellChecker/hunspell/depcomp
#       modified:   src/plugins/contrib/SpellChecker/hunspell/install-sh
#       modified:   src/plugins/contrib/SpellChecker/hunspell/intl/config.charse                                                            t
#       modified:   src/plugins/contrib/SpellChecker/hunspell/ltmain.sh
#       modified:   src/plugins/contrib/SpellChecker/hunspell/missing
#       modified:   src/plugins/contrib/SpellChecker/hunspell/mkinstalldirs
#       modified:   src/plugins/contrib/SpellChecker/hunspell/src/tools/affixcom                                                            press
#       modified:   src/plugins/contrib/SpellChecker/hunspell/src/tools/ispellaf                                                            f2myspell
#       modified:   src/plugins/contrib/SpellChecker/hunspell/src/tools/makealia                                                            s
#       modified:   src/plugins/contrib/SpellChecker/hunspell/src/tools/wordform                                                            s
#       modified:   src/plugins/contrib/SpellChecker/hunspell/src/tools/wordlist                                                            2hunspell
#       modified:   src/plugins/contrib/SpellChecker/wxspellchecker/build/config                                                            .guess
#       modified:   src/plugins/contrib/SpellChecker/wxspellchecker/build/config                                                            .sub
#       modified:   src/plugins/contrib/help_plugin/zlib/configure
#       modified:   src/plugins/contrib/help_plugin/zlib/make_vms.com
#       modified:   src/plugins/contrib/wxContribItems/wxchart/build/acregen.sh
#       modified:   src/plugins/contrib/wxContribItems/wxchart/build/config.gues                                                            s
#       modified:   src/plugins/contrib/wxContribItems/wxchart/build/config.sub
#       modified:   src/plugins/contrib/wxContribItems/wxchart/build/install.sh
#       modified:   src/plugins/contrib/wxContribItems/wxchart/configure
#       modified:   src/plugins/contrib/wxContribItems/wxthings/build/acregen.sh
#       modified:   src/plugins/contrib/wxContribItems/wxthings/build/config.gue                                                            ss
#       modified:   src/plugins/contrib/wxContribItems/wxthings/build/config.sub
#       modified:   src/plugins/contrib/wxContribItems/wxthings/build/install.sh
#       modified:   src/plugins/contrib/wxContribItems/wxthings/configure
#       modified:   src/sdk/resources/lexers/lexer_bash.sample
#       modified:   src/sdk/wxpropgrid/build/config.guess
#       modified:   src/sdk/wxpropgrid/build/config.sub
#       modified:   src/sdk/wxpropgrid/configure
#       modified:   src/sdk/wxscintilla/src/scintilla_generator/gen_iface.py
#       modified:   src/update
#       modified:   src/update29
#       modified:   src/update30
#
no changes added to commit (use "git add" and/or "git commit -a")



[email protected] /f/jens-codeblocks-mirror/codeblocks.git
$ git svn fetch
        M       debian/changelog
        M       codeblocks.spec.in
        M       update_revision.sh
r9493 = ce9d1a24a0a0d2d945dfed9d2493a353c21e592c (refs/remotes/release-13.12)
        M       debian/changelog
        M       codeblocks.spec.in
r9494 = 4358e1d0ed886f1581ed4f19863418c8b4d9fbfc (refs/remotes/trunk)

[email protected] /f/jens-codeblocks-mirror/codeblocks.git
$ git checkout -b trunk --track remotes/trunk
M       debian/codeblocks-contrib.postinst
M       debian/codeblocks.postinst
M       src/exchndl.dll
M       src/mac_pack
M       src/plugins/contrib/SpellChecker/hunspell/config.guess
M       src/plugins/contrib/SpellChecker/hunspell/config.rpath
M       src/plugins/contrib/SpellChecker/hunspell/config.sub
M       src/plugins/contrib/SpellChecker/hunspell/configure
M       src/plugins/contrib/SpellChecker/hunspell/depcomp
M       src/plugins/contrib/SpellChecker/hunspell/install-sh
M       src/plugins/contrib/SpellChecker/hunspell/intl/config.charset
M       src/plugins/contrib/SpellChecker/hunspell/ltmain.sh
M       src/plugins/contrib/SpellChecker/hunspell/missing
M       src/plugins/contrib/SpellChecker/hunspell/mkinstalldirs
M       src/plugins/contrib/SpellChecker/hunspell/src/tools/affixcompress
M       src/plugins/contrib/SpellChecker/hunspell/src/tools/ispellaff2myspell
M       src/plugins/contrib/SpellChecker/hunspell/src/tools/makealias
M       src/plugins/contrib/SpellChecker/hunspell/src/tools/wordforms
M       src/plugins/contrib/SpellChecker/hunspell/src/tools/wordlist2hunspell
M       src/plugins/contrib/SpellChecker/wxspellchecker/build/config.guess
M       src/plugins/contrib/SpellChecker/wxspellchecker/build/config.sub
M       src/plugins/contrib/help_plugin/zlib/configure
M       src/plugins/contrib/help_plugin/zlib/make_vms.com
M       src/plugins/contrib/wxContribItems/wxchart/build/acregen.sh
M       src/plugins/contrib/wxContribItems/wxchart/build/config.guess
M       src/plugins/contrib/wxContribItems/wxchart/build/config.sub
M       src/plugins/contrib/wxContribItems/wxchart/build/install.sh
M       src/plugins/contrib/wxContribItems/wxchart/configure
M       src/plugins/contrib/wxContribItems/wxthings/build/acregen.sh
M       src/plugins/contrib/wxContribItems/wxthings/build/config.guess
M       src/plugins/contrib/wxContribItems/wxthings/build/config.sub
M       src/plugins/contrib/wxContribItems/wxthings/build/install.sh
M       src/plugins/contrib/wxContribItems/wxthings/configure
M       src/sdk/resources/lexers/lexer_bash.sample
M       src/sdk/wxpropgrid/build/config.guess
M       src/sdk/wxpropgrid/build/config.sub
M       src/sdk/wxpropgrid/configure
M       src/sdk/wxscintilla/src/scintilla_generator/gen_iface.py
M       src/update
M       src/update29
M       src/update30
fatal: Cannot setup tracking information; starting point 'remotes/trunk' is not a branch.

[email protected] /f/jens-codeblocks-mirror/codeblocks.git
$ git branch -a
* master
  release_12.11
  release_13.12
  remotes/CODEBLOCKS_1_0RC2
  remotes/CODEBLOCKS_1_0RC2_FINAL
  remotes/LAB
  remotes/New_wxSmith
  remotes/[email protected]
  remotes/VERSION_1_0
  remotes/aui_test
  remotes/backup_of_trunk_before_switch_to_codecompletion_refactrong
  remotes/cf
  remotes/codeblocks_console
  remotes/codecompletion_refactoring
  remotes/ex
  remotes/[email protected]
  remotes/release-10.05
  remotes/release-12.11
  remotes/release-13.12
  remotes/release-8.02
  remotes/release-xx.yy
  remotes/rick_s_playground
  remotes/sc
  remotes/scintilla
  remotes/scripting_squirrel
  remotes/sqrat
  remotes/tags/10.05
  remotes/tags/8.02
  remotes/tags/CODEBLOCKS_1_0_BETA1
  remotes/tags/CODEBLOCKS_1_0_BETA2
  remotes/tags/CODEBLOCKS_1_0_BETA3
  remotes/tags/CODEBLOCKS_1_0_BETA4
  remotes/tags/CODEBLOCKS_1_0_BETA5
  remotes/tags/CODEBLOCKS_1_0_BETA6
  remotes/tags/CODEBLOCKS_1_0_BETA7
  remotes/tags/CODEBLOCKS_1_0_FINALBETA
  remotes/tags/CODEBLOCKS_1_0_RC1
  remotes/tags/CODEBLOCKS_1_0_RC1_1
  remotes/tags/SNAPSHOT_24_6_05
  remotes/tags/SNAPSHOT_28052005
  remotes/tags/SNAPSHOT_5_5_05
  remotes/tags/SNAPSHOT_AUG_04_2005
  remotes/tags/SNAPSHOT_AUG_11_2005
  remotes/tags/SNAPSHOT_AUG_17_2005
  remotes/tags/SNAPSHOT_UNICODE
  remotes/tags/VERSION_1_0_MERGE_TO_HEAD
  remotes/tags/before_merge_codecompletion_refactoring
  remotes/tags/head_merged_to_yt
  remotes/tags/wiley1
  remotes/tags/wxpropgrid_debugger_merge_candidate
  remotes/trunk
  remotes/wxfnb_to_wxaui
  remotes/wxpropgrid_debugger
  remotes/wxsmith_addons
  remotes/xml_compiler
  remotes/ym_gdb
  remotes/yt

[email protected] /f/jens-codeblocks-mirror/codeblocks.git
$ git svn rebase
debian/codeblocks-contrib.postinst: needs update
debian/codeblocks.postinst: needs update
src/exchndl.dll: needs update
src/mac_pack: needs update
src/plugins/contrib/SpellChecker/hunspell/config.guess: needs update
src/plugins/contrib/SpellChecker/hunspell/config.rpath: needs update
src/plugins/contrib/SpellChecker/hunspell/config.sub: needs update
src/plugins/contrib/SpellChecker/hunspell/configure: needs update
src/plugins/contrib/SpellChecker/hunspell/depcomp: needs update
src/plugins/contrib/SpellChecker/hunspell/install-sh: needs update
src/plugins/contrib/SpellChecker/hunspell/intl/config.charset: needs update
src/plugins/contrib/SpellChecker/hunspell/ltmain.sh: needs update
src/plugins/contrib/SpellChecker/hunspell/missing: needs update
src/plugins/contrib/SpellChecker/hunspell/mkinstalldirs: needs update
src/plugins/contrib/SpellChecker/hunspell/src/tools/affixcompress: needs update
src/plugins/contrib/SpellChecker/hunspell/src/tools/ispellaff2myspell: needs update
src/plugins/contrib/SpellChecker/hunspell/src/tools/makealias: needs update
src/plugins/contrib/SpellChecker/hunspell/src/tools/wordforms: needs update
src/plugins/contrib/SpellChecker/hunspell/src/tools/wordlist2hunspell: needs update
src/plugins/contrib/SpellChecker/wxspellchecker/build/config.guess: needs update
src/plugins/contrib/SpellChecker/wxspellchecker/build/config.sub: needs update
src/plugins/contrib/help_plugin/zlib/configure: needs update
src/plugins/contrib/help_plugin/zlib/make_vms.com: needs update
src/plugins/contrib/wxContribItems/wxchart/build/acregen.sh: needs update
src/plugins/contrib/wxContribItems/wxchart/build/config.guess: needs update
src/plugins/contrib/wxContribItems/wxchart/build/config.sub: needs update
src/plugins/contrib/wxContribItems/wxchart/build/install.sh: needs update
src/plugins/contrib/wxContribItems/wxchart/configure: needs update
src/plugins/contrib/wxContribItems/wxthings/build/acregen.sh: needs update
src/plugins/contrib/wxContribItems/wxthings/build/config.guess: needs update
src/plugins/contrib/wxContribItems/wxthings/build/config.sub: needs update
src/plugins/contrib/wxContribItems/wxthings/build/install.sh: needs update
src/plugins/contrib/wxContribItems/wxthings/configure: needs update
src/sdk/resources/lexers/lexer_bash.sample: needs update
src/sdk/wxpropgrid/build/config.guess: needs update
src/sdk/wxpropgrid/build/config.sub: needs update
src/sdk/wxpropgrid/configure: needs update
src/sdk/wxscintilla/src/scintilla_generator/gen_iface.py: needs update
src/update: needs update
src/update29: needs update
src/update30: needs update
update-index --refresh: command returned error: 1


[email protected] /f/jens-codeblocks-mirror/codeblocks.git


It looks like git svn fetch works Ok, but git svn rebase failed.

BTW: I'm using MSYS2 (x32-msys2-20131003.tar.xz (http://sourceforge.net/projects/msys2/files/Alpha-versions/32-bit/x32-msys2-20131003.tar.xz/download), newer version exists in msys2 site) under WinXP.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: jens on December 22, 2013, 09:38:23 am
Try git reset --hard remotes/trunk if you are in master branch.
I suggest removing everything, except the .git folder or unpack in a fresh folder.

Code: [Select]
[email protected]:~/tmp/codeblocks.git (master *)$ ll
insgesamt 0
[email protected]:~/tmp/codeblocks.git (master *)$ git reset --hard remotes/trunk
HEAD is now at a8fd2cf * compiler: fix MinGW auto detection, we actually distribute 'mingw32-make' (not 'make')
[email protected]:~/tmp/codeblocks.git (master)$ ll
insgesamt 940
-rw-r--r--  1 jens jens  25558 Dez 22 09:36 acinclude.m4
-rw-r--r--  1 jens jens   1711 Dez 22 09:36 AUTHORS
-rwxr-xr-x  1 jens jens   2169 Dez 22 09:36 bootstrap
-rw-r--r--  1 jens jens    120 Dez 22 09:36 BUGS
-rw-r--r--  1 jens jens   3062 Dez 22 09:36 BUILD
-rw-r--r--  1 jens jens 761895 Dez 22 09:36 ChangeLog
-rw-r--r--  1 jens jens  13292 Dez 22 09:36 ChangeLog.xsl
-rw-r--r--  1 jens jens    536 Dez 22 09:36 codeblocks.pc.in
-rw-r--r--  1 jens jens   4143 Dez 22 09:36 codeblocks.plist.in
-rw-r--r--  1 jens jens  17387 Dez 22 09:36 codeblocks.spec.in
-rw-r--r--  1 jens jens   3058 Dez 22 09:36 COMPILERS
-rw-r--r--  1 jens jens  18940 Dez 22 09:36 configure.ac
-rw-r--r--  1 jens jens  35148 Dez 22 09:36 COPYING
drwxr-xr-x  4 jens jens   4096 Dez 22 09:36 debian
-rw-r--r--  1 jens jens    573 Dez 22 09:36 Makefile.am
-rw-r--r--  1 jens jens     78 Dez 22 09:36 NEWS
-rw-r--r--  1 jens jens    187 Dez 22 09:36 README
-rw-r--r--  1 jens jens    463 Dez 22 09:36 README.debian
drwxr-xr-x 14 jens jens   4096 Dez 22 09:36 src
-rw-r--r--  1 jens jens     40 Dez 22 09:36 TODO
-rwxr-xr-x  1 jens jens   1219 Dez 22 09:36 updateChangeLog.sh
-rwxr-xr-x  1 jens jens   2261 Dez 22 09:36 update_revision.sh
[email protected]:~/tmp/codeblocks.git (master)$ git status
# On branch master
nothing to commit (working directory clean)
[email protected]:~/tmp/codeblocks.git (master)$ git svn rebase --all
M debian/changelog
M codeblocks.spec.in
M update_revision.sh
r9493 = ce9d1a24a0a0d2d945dfed9d2493a353c21e592c (refs/remotes/release-13.12)
M debian/changelog
M codeblocks.spec.in
r9494 = 4358e1d0ed886f1581ed4f19863418c8b4d9fbfc (refs/remotes/trunk)
First, rewinding head to replay your work on top of it...
Fast-forwarded master to refs/remotes/trunk.
[email protected]:~/tmp/codeblocks.git (master)$ git status
# On branch master
nothing to commit (working directory clean)
[email protected]:~/tmp/codeblocks.git (master)$
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: jens on December 22, 2013, 09:57:04 am
It should also work as you did it (at least it works on linux).
Can you try it with TortoiseGit or another real windows git, not in a msys shell ?

Can you check the md5sum of the downloade archive ?
It should be
Code: [Select]
ca06385f8617381f6a6ad7e05a47c2bf
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 22, 2013, 01:11:40 pm
It should also work as you did it (at least it works on linux).
Can you try it with TortoiseGit or another real windows git, not in a msys shell ?
Maybe, you have never tried git under Windows. Under Windows, I think there are two distributions, on called msysgit, which is used by TortoiseGit, and is based on MSYS1(the msys version supplied by www.mingw.org),  the other one is MSYS2 as I said before, it was new and I think it is also modern and good (ported from latest cygwin source code).

I just tried under msysgit, I get the same result:
Code: [Select]
[email protected] /f/jens-codeblocks-mirror/codeblocks.git (master)
$ git reset --hard remotes/trunk
Checking out files: 100% (5639/5639), done.
HEAD is now at a8fd2cf * compiler: fix MinGW auto detection, we actually distrib
ute 'mingw32-make' (not 'make')

[email protected] /f/jens-codeblocks-mirror/codeblocks.git (master)
$ git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   bootstrap
#       modified:   debian/get-orig-source
#       modified:   debian/get-orig-source-from-svn
#       modified:   debian/rules
#       modified:   src/batch_build_all
#       modified:   src/batch_build_core
#       modified:   src/mac_pack
#       modified:   src/plugins/contrib/DoxyBlocks/update
#       modified:   src/plugins/contrib/DoxyBlocks/update29
#       modified:   src/plugins/contrib/DoxyBlocks/update30
#       modified:   src/plugins/contrib/IncrementalSearch/update
#       modified:   src/plugins/contrib/IncrementalSearch/update29
#       modified:   src/plugins/contrib/IncrementalSearch/update30
#       modified:   src/plugins/contrib/SpellChecker/hunspell/ltmain.sh
#       modified:   src/plugins/contrib/SpellChecker/update
#       modified:   src/plugins/contrib/SpellChecker/update29
#       modified:   src/plugins/contrib/SpellChecker/update30
#       modified:   src/plugins/contrib/SpellChecker/wxspellchecker/build/acrege
n.sh
#       modified:   src/plugins/contrib/SpellChecker/wxspellchecker/build/instal
l.sh
#       modified:   src/plugins/contrib/ThreadSearch/update
#       modified:   src/plugins/contrib/ThreadSearch/update29
#       modified:   src/plugins/contrib/ThreadSearch/update30
#       modified:   src/plugins/contrib/ToolsPlus/update
#       modified:   src/plugins/contrib/ToolsPlus/update29
#       modified:   src/plugins/contrib/ToolsPlus/update30
#       modified:   src/plugins/contrib/Valgrind/update
#       modified:   src/plugins/contrib/Valgrind/update29
#       modified:   src/plugins/contrib/Valgrind/update30
#       modified:   src/plugins/contrib/codesnippets/update
#       modified:   src/plugins/contrib/codesnippets/update29
#       modified:   src/plugins/contrib/codesnippets/update30
#       modified:   src/plugins/contrib/lib_finder/update
#       modified:   src/plugins/contrib/lib_finder/update29
#       modified:   src/plugins/contrib/lib_finder/update30
#       modified:   src/plugins/contrib/wxSmith/update
#       modified:   src/plugins/contrib/wxSmith/update29
#       modified:   src/plugins/contrib/wxSmith/update30
#       modified:   src/sdk/wxpropgrid/build/acregen.sh
#       modified:   src/sdk/wxpropgrid/build/install.sh
#       modified:   src/update
#       modified:   src/update29
#       modified:   src/update30
#       modified:   updateChangeLog.sh
#       modified:   update_revision.sh
#
no changes added to commit (use "git add" and/or "git commit -a")

[email protected] /f/jens-codeblocks-mirror/codeblocks.git (master)
$ ll
bash: ll: command not found

[email protected] /f/jens-codeblocks-mirror/codeblocks.git (master)
$

I don't know about the ll command.

Quote
Can you check the md5sum of the downloade archive ?
It should be
Code: [Select]
ca06385f8617381f6a6ad7e05a47c2bf
Yes, md5sum is the same, so I download the correct file.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: jens on December 22, 2013, 01:22:51 pm
ll is an alias for ls -l.
It might probably be an issue with line-endings or the executable-flag (all files are linux shell-scripts).
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 22, 2013, 02:10:26 pm
ll is an alias for ls -l.
It might probably be an issue with line-endings or the executable-flag (all files are linux shell-scripts).
Thank, it looks like the difference is, for example
Code: [Select]
bootstrap | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bootstrap b/bootstrap
old mode 100755
new mode 100644

This looks like the executable-flag.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: jens on December 22, 2013, 02:45:02 pm
ll is an alias for ls -l.
It might probably be an issue with line-endings or the executable-flag (all files are linux shell-scripts).
Thank, it looks like the difference is, for example
Code: [Select]
bootstrap | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bootstrap b/bootstrap
old mode 100755
new mode 100644

This looks like the executable-flag.
In .git/config you can set [core] filemode to false.
Either manually or with git config --local core.filemode false.
Maybe deleting the line completely will also work (I guess the global setting is false on windows).
Quote from: https://www.kernel.org/pub/software/scm/git/docs/git-config.html
core.fileMode

    If false, the executable bit differences between the index and the working tree are ignored; useful on broken filesystems like FAT. See git-update-index(1).

    The default is true, except git-clone(1) or git-init(1) will probe and set core.fileMode false if appropriate when the repository is created.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 22, 2013, 02:47:37 pm
In .git/config you can set [core] filemode to false.
Either manually or with git config --local core.filemode false.
Maybe deleting the line completely will also work (I guess the global setting is false on windows).
Quote from: https://www.kernel.org/pub/software/scm/git/docs/git-config.html
core.fileMode

    If false, the executable bit differences between the index and the working tree are ignored; useful on broken filesystems like FAT. See git-update-index(1).

    The default is true, except git-clone(1) or git-init(1) will probe and set core.fileMode false if appropriate when the repository is created.

Ok, I will try it now.

Some information which may be useful.

http://stackoverflow.com/questions/1271449/how-to-set-subversion-properties-with-git-svn

It looks like we can have a .gitattributes file (quite similar with the one we already have .gitignore file), in this file, we can set the executable flags for those files. Not sure this can solve my issue, I need to read more...
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 22, 2013, 03:01:44 pm
In .git/config you can set [core] filemode to false.
Either manually or with git config --local core.filemode false.
Maybe deleting the line completely will also work (I guess the global setting is false on windows).
Quote from: https://www.kernel.org/pub/software/scm/git/docs/git-config.html
core.fileMode

    If false, the executable bit differences between the index and the working tree are ignored; useful on broken filesystems like FAT. See git-update-index(1).

    The default is true, except git-clone(1) or git-init(1) will probe and set core.fileMode false if appropriate when the repository is created.

Ok, I will try it now.


Good news, see the log:
Code: [Select]

[email protected] /f/jens-codeblocks-mirror/codeblocks.git (master)
$ git config --list
core.symlinks=false
core.autocrlf=true
color.diff=auto
color.status=auto
color.branch=auto
color.interactive=true
pack.packsizelimit=2g
help.format=html
http.sslcainfo=/bin/curl-ca-bundle.crt
sendemail.smtpserver=/bin/msmtp.exe
diff.astextplain.textconv=astextplain
rebase.autosquash=true
user.name=asmwarrior
user.email=...
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
svn-remote.svn.url=http://svn.code.sf.net/p/codeblocks/code
svn-remote.svn.fetch=trunk:refs/remotes/trunk
svn-remote.svn.branches=branches/*:refs/remotes/*
svn-remote.svn.tags=tags/*:refs/remotes/tags/*

[email protected] /f/jens-codeblocks-mirror/codeblocks.git (master)
$ git config --local core.filemode false

[email protected] /f/jens-codeblocks-mirror/codeblocks.git (master)
$ git config --list
core.symlinks=false
core.autocrlf=true
color.diff=auto
color.status=auto
color.branch=auto
color.interactive=true
pack.packsizelimit=2g
help.format=html
http.sslcainfo=/bin/curl-ca-bundle.crt
sendemail.smtpserver=/bin/msmtp.exe
diff.astextplain.textconv=astextplain
rebase.autosquash=true
user.name=asmwarrior
user.email=...
core.repositoryformatversion=0
core.filemode=false
core.bare=false
core.logallrefupdates=true
svn-remote.svn.url=http://svn.code.sf.net/p/codeblocks/code
svn-remote.svn.fetch=trunk:refs/remotes/trunk
svn-remote.svn.branches=branches/*:refs/remotes/*
svn-remote.svn.tags=tags/*:refs/remotes/tags/*

[email protected] /f/jens-codeblocks-mirror/codeblocks.git (master)
$ git reset --hard remotes/trunk
HEAD is now at a8fd2cf * compiler: fix MinGW auto detection, we actually distrib
ute 'mingw32-make' (not 'make')

[email protected] /f/jens-codeblocks-mirror/codeblocks.git (master)
$ git status
# On branch master
nothing to commit, working directory clean

[email protected] /f/jens-codeblocks-mirror/codeblocks.git (master)
$

Look, it was clean working directory now.

The next step I want to do is try to see whether I can have commit to svn.
As you mirror url is “http://svn.code.sf.net/p/codeblocks/code”, is it possible to becomes "https://svn.code.sf.net/p/codeblocks/code"?

Another concern is that my working git mirror(not full svn revision mirrored), I see the url is "https://[email protected]/p/codeblocks/code/trunk"

So, if I need a commit access, I guess the url name is "https://<[email protected]", which means every developer has their own unique urls. As OBF said, if the git commit SHA value is calculated from(depends on) the svn url, it is hard to reuse the git mirror mirrored from different svn urls. Maybe, we can only mirror the C::B SVN protocol?
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: jens on December 22, 2013, 03:17:04 pm
After doing the hard-reset, but before fetching any new revisions you can try this approach:
http://theadmin.org/articles/git-svn-switch-to-a-different-a-svn-url/ (http://theadmin.org/articles/git-svn-switch-to-a-different-a-svn-url/)

I did it on my local git-svn repo, when we switched from berlios to sourceforge.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 22, 2013, 03:48:54 pm
After doing the hard-reset, but before fetching any new revisions you can try this approach:
http://theadmin.org/articles/git-svn-switch-to-a-different-a-svn-url/ (http://theadmin.org/articles/git-svn-switch-to-a-different-a-svn-url/)

I did it on my local git-svn repo, when we switched from berlios to sourceforge.
Hi, jens, many thanks, it works perfect, now I have a git repo which has those features.
1, has the whole code history
2, let me synchronize the official svn repo by "git svn rebase"
3, let me commit back to svn repo

Suggest: I think you can share the file codeblocks.git.tar.xz with all the C::B devs who want to use git, the codeblocks.git.tar.xz file don't need to updated daily, because the user can later use git svn rebase to synchronize them. For Windows user, don't remember to set the filemode = false. For my experience, the msysgit is currently recommended. (MSYS2 20131003 release in my test some times report: error: git-svn died of signal 6, I didn't test the newer MSYS2).

Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on December 22, 2013, 04:23:18 pm
Some further information about the git commit SHA value and commit log message.
I just did a SVN url change(see: Re: Read-only Git, SVN Repo for Code::Blocks (http://forums.codeblocks.org/index.php/topic,16096.msg128151.html#msg128151)), and later I did a git svn rebase.

Now, I see the SHA value are different for the new fetched svn commit.

For example, in
http://cgit.jenslody.de/codeblocks/commit/
The latest commit is:
Code: [Select]
author biplab <[email protected]> 2013-12-21 14:59:38 (GMT)
committer biplab <[email protected]> 2013-12-21 14:59:38 (GMT)
commit 4358e1d0ed886f1581ed4f19863418c8b4d9fbfc (patch)
tree a011291b7dfc74843c79599c6a2c7a9638b11433
parent a8fd2cf9415f205012f5389fde815a867061924b (diff)
download codeblocks-master.tar.bz2
codeblocks-master.tar.xz
* Fixed: Typos.
git-svn-id: http://svn.code.sf.net/p/codeblocks/code/[email protected] 2a5c6006-c6dd-42ca-98ab-0921f2732cef

Now, in my local git repo, it is:
Code: [Select]
Revision: bea9e5858389b5a522d67335d62a2ad065a3bd50
Author: biplab <[email protected]>
Date: 2013-12-21 22:59:38
Message:
* Fixed: Typos.

git-svn-id: https://svn.code.sf.net/p/codeblocks/code/[email protected] 2a5c6006-c6dd-42ca-98ab-0921f2732cef
----
Modified: codeblocks.spec.in
Modified: debian/changelog

Look, the log messages(svn url), SHA-1 values are different.

The commit before "git svn rebase/fetch" are the same.

One guess: if jens' original git was mirrored from some url like: https://[email protected]/p/codeblocks/code where xxx is your SF id, then maybe, we can get the same commit SHA-1 value and log message. Since in my git config file, I have:
Code: [Select]
url = https://[email protected]/p/codeblocks/code
But look at the log message, it did strip the "[email protected]" string.


Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on January 06, 2014, 05:04:11 am
I add source mirror information to the wiki, see this change Developer documentation - CodeBlocks (http://wiki.codeblocks.org/index.php?title=Developer_documentation&action=historysubmit&diff=7702&oldid=7669)
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: LETARTARE on February 27, 2015, 11:14:22 am
@biplab
Your site is down???
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on February 27, 2015, 01:58:15 pm
@biplab
Your site is down???
Works fine here:
http://cb.biplab.in/websvn/listing.php?repname=codeblocks
and
http://cb.biplab.in/cgit/
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: LETARTARE on February 27, 2015, 02:49:37 pm
but :
svn://cb.biplab.in/codeblocks/trunk (http://svn://cb.biplab.in/codeblocks/trunk)
will not answer.
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: mageia on March 13, 2015, 06:52:55 pm
why not github,your repo always down?
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on April 06, 2015, 03:43:14 pm
@biplab, I just notice that your git mirror doesn't updated for about 12 days, see:
http://cb.biplab.in/cgit/codeblocks/log/
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: ollydbg on September 04, 2016, 02:12:09 am
@biplab, your svn mirror is not working for about one months, can you have a look?
http://cb.biplab.in/cgit/codeblocks/log/
Title: Re: Read-only Git, SVN Repo for Code::Blocks
Post by: turbosnail on September 30, 2016, 09:15:07 am
i found https://sourceforge.net/p/codeblocks/git/ref/master/
may be it was better if use this git repo for mirror?