Developer forums (C::B DEVELOPMENT STRICTLY!) > Development

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

<< < (11/14) > >>

ollydbg:

--- Quote from: oBFusCATed on December 21, 2013, 03:45:30 pm ---
--- Quote from: ollydbg on December 21, 2013, 03:03:58 pm ---But I think that your git repo synchronize with the svn by hand? (not automatically?)

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

--- End quote ---
Yes, an automatic synchronization method is great!

@Jen:
I try to use your achieve file, and found some issue, see the log:

--- Code: ---I just run the command:

zyh23@zyh /f/jens-codeblocks-mirror
$ tar xvfJ ./codeblocks.git.tar.xz
...

zyh23@zyh /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')

zyh23@zyh /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")



zyh23@zyh /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)

zyh23@zyh /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.

zyh23@zyh /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/New_wxSmith@2977
  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/ex@2936
  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

zyh23@zyh /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


zyh23@zyh /f/jens-codeblocks-mirror/codeblocks.git


--- End code ---

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.

Jenna:
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: ---jens@jenslody:~/tmp/codeblocks.git (master *)$ ll
insgesamt 0
jens@jenslody:~/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')
jens@jenslody:~/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
jens@jenslody:~/tmp/codeblocks.git (master)$ git status
# On branch master
nothing to commit (working directory clean)
jens@jenslody:~/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.
jens@jenslody:~/tmp/codeblocks.git (master)$ git status
# On branch master
nothing to commit (working directory clean)
jens@jenslody:~/tmp/codeblocks.git (master)$

--- End code ---

Jenna:
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: ---ca06385f8617381f6a6ad7e05a47c2bf
--- End code ---

ollydbg:

--- Quote from: 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 ?

--- End quote ---
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: ---zyh23@ZYH /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')

zyh23@ZYH /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")

zyh23@ZYH /f/jens-codeblocks-mirror/codeblocks.git (master)
$ ll
bash: ll: command not found

zyh23@ZYH /f/jens-codeblocks-mirror/codeblocks.git (master)
$

--- End code ---

I don't know about the ll command.


--- Quote ---Can you check the md5sum of the downloade archive ?
It should be
--- Code: ---ca06385f8617381f6a6ad7e05a47c2bf
--- End code ---

--- End quote ---
Yes, md5sum is the same, so I download the correct file.

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

Navigation

[0] Message Index

[#] Next page

[*] Previous page