[FFmpeg-devel] Git switch is ready to go!

Janne Grunau janne-ffmpeg
Fri Jan 14 23:25:50 CET 2011

On Fri, Jan 14, 2011 at 10:58:27PM +0100, Michael Niedermayer wrote:
> On Wed, Jan 12, 2011 at 08:51:32PM +0100, Janne Grunau wrote:
> > Hi,
> > 
> > I've updated http://git.videolan.org/?p=FFmpeg-sandbox.git;a=summary with
> > latest svn commit r26322.
> > 
> > After installing the desired hooks tonight we are ready to switch to git
> > from my point of view.
> In principle iam ok with making svn read only and doing the switch now but
> it seems the checklist has not been fullfilled
> I cant find our git howto in svn nor on wiki.multimedia.cx nor with
> google.
> And the last text by luca does not sufficiently discuss rebase vs merge,
> actually i think the command wont even work if i understood the intended
> configuration correctly

I'll look at the latest patch. All merges will be disabled for no, see

> Also just to confirm

> * The svnlog mailinglist will receive unabrevated commit diffs?

I think we need to subscribe the sender to -cvslog. Who admins that

> * The repository will refuse non fast forward pushes?

Yes, it even refuses pushes with merge commits in it. Speaking from
recent experience from the switch to git in mythtv it's useful until
most devs are comfortable with git. This means rebase or
git pull --rebase is required before pushing. I'll update the howto to
reflect this.


More information about the ffmpeg-devel mailing list