[Digikam-devel] Re: how to use git as subversion

Gilles Caulier caulier.gilles at gmail.com
Mon Feb 7 11:30:47 GMT 2011


2011/2/6 Marcel Wiesweg <marcel.wiesweg at gmx.de>:
>
> Short summary:
>
> git up
>
> git commit <path>
> git push
>
> where "git up" is an alias for "git pull --rebase", as given in the longer
> mail.

I still have a problem with this :

[gilles at localhost core]$ pwd
/mnt/data/Devel/GIT/digikam-sc/core

[gilles at localhost core]$ ls -al
total 4514
drwxr-xr-x 16 gilles gilles    1296 2011-02-07 12:17 ./
drwxr-xr-x  8 gilles gilles     608 2011-02-07 11:37 ../
-rw-r--r--  1 gilles gilles    8730 2011-02-07 11:20 AUTHORS
-rw-r--r--  1 gilles gilles 4257925 2011-02-07 11:19 ChangeLog
drwxr-xr-x  4 gilles gilles     104 2011-02-07 11:19 cmake/
drwxr-xr-x  4 gilles gilles     200 2011-02-07 11:37 CMakeFiles/
-rw-r--r--  1 gilles gilles    2204 2011-02-07 11:37 cmake_install.cmake
-rw-r--r--  1 gilles gilles   77498 2011-02-07 11:20 CMakeLists.txt
-rw-r--r--  1 gilles gilles    1942 2011-02-07 11:37 config-digikam.h
-rw-r--r--  1 gilles gilles    1978 2011-02-07 11:20 config-digikam.h.cmake
-rw-r--r--  1 gilles gilles   18011 2011-02-07 11:19 COPYING
-rw-r--r--  1 gilles gilles   20403 2011-02-07 11:19 COPYING.DOC
-rw-r--r--  1 gilles gilles   26527 2011-02-07 11:19 COPYING.LIB
-rw-r--r--  1 gilles gilles     429 2011-02-07 11:37 CTestTestfile.cmake
drwxr-xr-x  9 gilles gilles     360 2011-02-07 11:37 data/
drwxr-xr-x  3 gilles gilles     488 2011-02-07 11:37 databaseserver/
-rw-r--r--  1 gilles gilles     911 2011-02-07 11:19 DESIGN
drwxr-xr-x  4 gilles gilles   12984 2011-02-07 12:23 digikam/
-rw-r--r--  1 gilles gilles    1159 2011-02-07 11:37 digikam.lsm
-rw-r--r--  1 gilles gilles    1186 2011-02-07 11:19 digikam.lsm.cmake
-rw-r--r--  1 gilles gilles   64333 2011-02-07 11:19 Doxyfile.cmake
drwxr-xr-x  8 gilles gilles     392 2011-02-07 12:23 .git/
-rw-r--r--  1 gilles gilles   15827 2011-02-07 11:19 HACKING
drwxr-xr-x  8 gilles gilles     368 2011-02-07 11:37 imageplugins/
-rw-r--r--  1 gilles gilles      87 2011-02-07 11:19 INSTALL
drwxr-xr-x  3 gilles gilles    1056 2011-02-07 11:37 kioslave/
-rw-r--r--  1 gilles gilles      80 2011-02-07 11:19 .krazy
drwxr-xr-x 18 gilles gilles     632 2011-02-07 11:37 libs/
-rw-r--r--  1 gilles gilles     101 2011-02-07 11:19 Mainpage.dox
-rw-r--r--  1 gilles gilles    6764 2011-02-07 11:37 Makefile
-rwxr-xr-x  1 gilles gilles     231 2011-02-07 11:19 Messages.sh*
-rw-r--r--  1 gilles gilles    3785 2011-02-07 12:17 NEWS
drwxr-xr-x  7 gilles gilles     864 2011-02-07 11:19 project/
-rw-r--r--  1 gilles gilles    7254 2011-02-07 11:20 README
-rw-r--r--  1 gilles gilles    1402 2011-02-07 11:20 README.FACE
drwxr-xr-x  4 gilles gilles     440 2011-02-07 11:37 showfoto/
-rw-r--r--  1 gilles gilles     585 2011-02-07 11:37 svnscript.cmake
drwxr-xr-x  5 gilles gilles    1400 2011-02-07 11:20 tests/
drwxr-xr-x  2 gilles gilles     392 2011-02-07 11:20 themedesigner/
-rw-r--r--  1 gilles gilles    6381 2011-02-07 11:19 tips
-rw-r--r--  1 gilles gilles    3226 2011-02-07 11:19 TODO
-rw-r--r--  1 gilles gilles     279 2011-02-07 11:20 TODO.FACE
-rw-r--r--  1 gilles gilles    2607 2011-02-07 11:19 TODO.MYSQLPORT
-rw-r--r--  1 gilles gilles    3096 2011-02-07 11:20 TODO.QTSCRIPT
drwxr-xr-x 22 gilles gilles     768 2011-02-07 11:37 utilities/

[gilles at localhost core]$ git pull --rebase -v
fatal: The remote end hung up unexpectedly

why ?

Gilles



More information about the Digikam-devel mailing list