[x264-devel] Switching to Git?

[Pierre d'Herbemont]

On Feb 20, 2008, at 7:27 AM, Loren Merritt wrote:

> On Tue, 19 Feb 2008, Pierre d'Herbemont wrote:
>
>> VLC is considering a switch to git. What would be your thought about
>> that?
>>
>> I think it would be wise to switch with us at the same time as we
>> share the same svn repo.
>
> No objection. I'm happy with svn, but ffmpeg will probably switch
> sometime, so I have to learn git anyway.

Then interested developers should send me an ssh keys.

Basically you'll get an access to a test repo (vlc-sandrox.git) so  
that you can familiarize with git. You are encouraged to push here.

Thanks,

Pierre.

----
Hi,

I have re-imported the current trunk with the correct (hopefully)
author name, it is available here:
http://git2.videolan.org/?p=vlc.git;a=summary
(Note that it is not resync-ed automatically with svn, we can do that
by hand when needed)

We are more or less ready to perform the switch, and we just need to
agree on a date to perform it (that mean freezing SVN, and making the
vlc.git writable).

A small summary:
* We are using gitosis for the administration of the repos. It is very
convenient.
* We do need a public key for each committer. Please send me yours.
* You are strongly encouraged to play a bit with vlc-sandrox to
familiarize with git
* You need to fix up your email address prior committing
* There are several way to work with git, for now I guess that the
typical commands that match our current svn usage are:
$ git clone git at git2.videolan.org:vlc-sandrox.git
$ git commit -a (no equivalent)
$ git commit myfile (no equivalent)
$ git pull --rebase # svn up
$ git push (svn commit)

A small note on git pull:
Basically when using git and committing locally you are indeed working
on your own branch, so a simple git pull will create a merge object
and merge your local branch to the upstream. That's not how svn works.
git pull --rebase will put your work on top of the latest commit in
upstream and will act as svn does.

Have fun,

Pierre.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mailman.videolan.org/pipermail/x264-devel/attachments/20080220/26104819/attachment.htm