[MPlayer-cvslog] r19258 - trunk/DOCS/tech/oggless-xiph-codecs.txt

[Luca Barbato]

Michael Niedermayer wrote:
> 1. we would have to look at git and carefully compare it to svn

http://git.or.cz/course/svn.html

> 2. we would need to ask devels about their oppinion about it

right

> 3. we would need to find a server with git for us (could be mphq of 
>    course), this would also solve the security issues with svn no i dont
>    completely agree with our root team about ssh with a "cvs/git/... shell"
>    being a sechole, instead IMHO svn with its homemade crap auth is a sechole
>    (and apache of course would be a giga sechole)

git actual suggested method is ssh and I know root at mplayerhq don't like
the idea.

> 4. convince rich (IIRC it was rich) that having a complete copy of the
>    repository with all revisions locally is a good idea :) or does git
>    support working with a "flat" repo?

hm why?

du -sh ffmpeg ffmpeg.git
28M     ffmpeg
26M     ffmpeg.git

ffmpeg is the subversion tree
ffmpeg.git is the converted one using git-svn (that is bidirectional and
lets you commit from this git to svn)

how to reproduce

install the latest git

mkdir ffmpeg.git

cd ffmpeg.git

#Import ffmpeg
git-svn init svn://svn.mplayerhq.hu/ffmpeg/trunk

git-svn fetch #(will take a bit, there are faster import methods)

git checkout -b my-branch remotes/git-svn #create your edit branch

git repack -a -d #set it up as private development using the compact
representation

#Import libswscale

GIT_SVN_ID=libswscale git-svn init
svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

GIT_SVN_ID=libswscale git-svn fetch

git-checkout -b libswscale remotes/libswscale

#Prepare the merge (dumb & simple way)
mkdir libswscale
git-mv Makefile libswscale/
git-mv cs_test.c libswscale/
git-mv rgb2rgb* libswscale/
git-mv swscale* libswscale/
git-mv yuv2rgb* libswscale/

git-commit -m "prepare libswscale to be imported in ffmpeg"

#Merge everything

git-checkout my-branch

git-merge "Merge libswscale on ffmpeg" my-branch libswscale

git-repack -a -d #cleanup & pack

gitk # to see the whole history [1]

NB: That is nearly optimal but still HAS issues (like not having a clean
way to split subrepos from bigger ones, or not having many alternatives
to ssh+restricted shell)

lu

[1] http://dev.gentoo.org/~lu_zero/screenshot/gitk.png

-- 

Luca Barbato

Gentoo/linux Gentoo/PPC
http://dev.gentoo.org/~lu_zero