Read-only Git, SVN Repo for Code::Blocks

[LETARTARE]

last few days :

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

[Biplab]

@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

[LETARTARE]

Thank you, it's ok.

[ollydbg]

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:

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

[ollydbg]

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.

[Biplab]

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.

[Biplab]

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.

[ollydbg]

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.

[ollydbg]

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), sorry about the noise.

[Jenna]

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.

I did not convert all branches and tags to git, just trunk and the actual revisions.

[ollydbg]

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.

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.

[Jenna]

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.

[ollydbg]

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.

[Jenna]

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

[ollydbg]

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

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/trunk@9492 2a5c6006-c6dd-42ca-98ab-0921f2732cef

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

Code

author	alpha0010 <alpha0010@2a5c6006-c6dd-42ca-98ab-0921f2732cef>	2013-12-16 16:21:24 (GMT)
committer	alpha0010 <alpha0010@2a5c6006-c6dd-42ca-98ab-0921f2732cef>	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/trunk@9492 2a5c6006-c6dd-42ca-98ab-0921f2732cef 

From biplab's cgit page: http://cb.biplab.in/cgit/codeblocks/commit/

Code

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/trunk@9492 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

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

git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@9487 2a5c6006-c6dd-42ca-98ab-0921f2732cef

and mine is:

Code

SHA-1: 0f5e0bf3386695c15051c922b67f4e7b72151215

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

git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@9487 2a5c6006-c6dd-42ca-98ab-0921f2732cef

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