Author Topic: Read-only Git, SVN Repo for Code::Blocks  (Read 50483 times)

Offline oBFusCATed

  • Developer
  • Lives here!
  • *****
  • Posts: 12595
    • Travis build status
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #45 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.
(most of the time I ignore long posts)
[strangers don't send me private messages, I'll ignore them; post a topic in the forum, but first read the rules!]

Offline ollydbg

  • Developer
  • Lives here!
  • *****
  • Posts: 5234
  • OpenCV and Robotics
    • Chinese OpenCV forum moderator
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #46 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.
« Last Edit: December 21, 2013, 03:09:47 pm by ollydbg »
If some piece of memory should be reused, turn them to variables (or const variables).
If some piece of operations should be reused, turn them to functions.
If they happened together, then turn them to classes.

Offline ollydbg

  • Developer
  • Lives here!
  • *****
  • Posts: 5234
  • OpenCV and Robotics
    • Chinese OpenCV forum moderator
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #47 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.
If some piece of memory should be reused, turn them to variables (or const variables).
If some piece of operations should be reused, turn them to functions.
If they happened together, then turn them to classes.

Offline ollydbg

  • Developer
  • Lives here!
  • *****
  • Posts: 5234
  • OpenCV and Robotics
    • Chinese OpenCV forum moderator
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #48 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
.......


« Last Edit: December 21, 2013, 03:42:37 pm by ollydbg »
If some piece of memory should be reused, turn them to variables (or const variables).
If some piece of operations should be reused, turn them to functions.
If they happened together, then turn them to classes.

Offline oBFusCATed

  • Developer
  • Lives here!
  • *****
  • Posts: 12595
    • Travis build status
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #49 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.
(most of the time I ignore long posts)
[strangers don't send me private messages, I'll ignore them; post a topic in the forum, but first read the rules!]

Offline ollydbg

  • Developer
  • Lives here!
  • *****
  • Posts: 5234
  • OpenCV and Robotics
    • Chinese OpenCV forum moderator
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #50 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, newer version exists in msys2 site) under WinXP.
If some piece of memory should be reused, turn them to variables (or const variables).
If some piece of operations should be reused, turn them to functions.
If they happened together, then turn them to classes.

Offline jens

  • Administrator
  • Lives here!
  • *****
  • Posts: 7253
    • Jens' unofficial debian-repository for the Code::Blocks - IDE
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #51 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)$

Offline jens

  • Administrator
  • Lives here!
  • *****
  • Posts: 7253
    • Jens' unofficial debian-repository for the Code::Blocks - IDE
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #52 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

Offline ollydbg

  • Developer
  • Lives here!
  • *****
  • Posts: 5234
  • OpenCV and Robotics
    • Chinese OpenCV forum moderator
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #53 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.
If some piece of memory should be reused, turn them to variables (or const variables).
If some piece of operations should be reused, turn them to functions.
If they happened together, then turn them to classes.

Offline jens

  • Administrator
  • Lives here!
  • *****
  • Posts: 7253
    • Jens' unofficial debian-repository for the Code::Blocks - IDE
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #54 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).

Offline ollydbg

  • Developer
  • Lives here!
  • *****
  • Posts: 5234
  • OpenCV and Robotics
    • Chinese OpenCV forum moderator
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #55 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.
If some piece of memory should be reused, turn them to variables (or const variables).
If some piece of operations should be reused, turn them to functions.
If they happened together, then turn them to classes.

Offline jens

  • Administrator
  • Lives here!
  • *****
  • Posts: 7253
    • Jens' unofficial debian-repository for the Code::Blocks - IDE
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #56 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.

Offline ollydbg

  • Developer
  • Lives here!
  • *****
  • Posts: 5234
  • OpenCV and Robotics
    • Chinese OpenCV forum moderator
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #57 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...
If some piece of memory should be reused, turn them to variables (or const variables).
If some piece of operations should be reused, turn them to functions.
If they happened together, then turn them to classes.

Offline ollydbg

  • Developer
  • Lives here!
  • *****
  • Posts: 5234
  • OpenCV and Robotics
    • Chinese OpenCV forum moderator
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #58 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?
« Last Edit: December 22, 2013, 03:03:38 pm by ollydbg »
If some piece of memory should be reused, turn them to variables (or const variables).
If some piece of operations should be reused, turn them to functions.
If they happened together, then turn them to classes.

Offline jens

  • Administrator
  • Lives here!
  • *****
  • Posts: 7253
    • Jens' unofficial debian-repository for the Code::Blocks - IDE
Re: Read-only Git, SVN Repo for Code::Blocks
« Reply #59 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/

I did it on my local git-svn repo, when we switched from berlios to sourceforge.