File: using_git

package info (click to toggle)
kst 2.0.8-6
  • links: PTS, VCS
  • area: main
  • in suites: sid, trixie
  • size: 30,748 kB
  • sloc: cpp: 97,086; ansic: 13,364; python: 2,970; sh: 761; yacc: 184; lex: 143; makefile: 141; javascript: 122; perl: 30; xml: 30
file content (77 lines) | stat: -rw-r--r-- 1,593 bytes parent folder | download | duplicates (4)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
Using Git as subversion client

http://git-scm.com/

Help:
    git help svn


Set up svn mirror, done only once
---------------------------------
Create a new directory e.g 'kst', and init your git repository with the svn path
    
    git svn init svn+ssh://YOU_USERNAME@svn.kde.org/home/kde/branches/work/kst/portto4/kst

Download the author mapping file into your new 'kst' folder from,
    https://github.com/downloads/syntheticpp/kst/.svn-author-file
or copy it from a svn checkout. Without this file git doesn't know the name 
and email address of the committer.

Configure git to use this file:

    git config --add svn.authorfile .svn-author-file


Then get all commits 

    git svn fetch

this will take a while. (It is possible to start at a later revision, 
for instance -r1307223, but then it is not possible to use other remote branches)

When finished there is an internally managed remote branch 'git-svn',
listed by 'git branch -r'.

Update the current local branch ('master' by default) with the fetched
svn commits:

    git svn rebase


Update existing repository with svn commits
-------------------------------------------

    git svn fetch
    git svn rebase
    
    
Rebase errors
-------------
When there are errors while rebasing, fix the mentioned <files>
then

   git add <files>
   git rebase --continue
   
    

Committing
----------
First commit your changes to your local branch
 
     git commit "message" -a
     
then commit to the svn repository
 
     git svn dcommit


History
-------
Browse history offline with a git-GUI gitk, gitg, qgit, ...