2010年3月24日 星期三

Develop with git, on svn repository

With mplayer svn tree, for example.

1. Check out mplayer source
svn checkout svn://svn.mplayerhq.hu/mplayer/trunk mplayer

2.Init git
git init
git add .
git rm --cached -r .svn
git rm --cached -r */.svn
git rm --cached -r */*/.svn
...
git commit -a -c "svn 30936"

3.Coding and commit with git

4.git log
commit 2714b3e5893e4fa72714839cc6e3b7b0c841f596
Author: Gung Shi Jie <adolf@gung-shi-jiede-macbook.local>
Date:   Wed Mar 24 18:33:29 2010 +0800

    Fix visualize buffer crash.
    Restore mp_msg in draw_arrow
.....
commit 74b2ef7c90a3c06191c87b1c2cef037f394bfa31
Author: Gung Shi Jie <adolf@gung-shi-jiede-macbook.local>
Date:   Fri Mar 19 15:32:31 2010 +0800

    mplayer-svn  rev. 30936.

5.generate a patch
git diff 74b2ef 2714b3 > my.diff

6.reverse the patch
patch -p1 -R < my.diff

7.commit for svn update
git commit -a -C "reverse to svn 30936"

8.svn update
9.patch
patch -p1 < my.diff
10.check for error and commit
Blogged with the Flock Browser

沒有留言:

張貼留言