[vlc-devel] Switching to git (2)

[Pierre d'Herbemont]

Hi Mark,

Don't worry I seriously plan to make sure all developers can access git.

Could you please send me your keys again. A rsa one preferably. I am  
sure it didn't work because either that's not the key in ~/.ssh/ 
id_rsa.pub or the one I did get from IRC was stripped or something.

Thanks!

Pierre.

On Feb 19, 2008, at 5:05 AM, Mark Moriarty wrote:

> Hopefully I'll be able to actually get a clean connection to it from  
> Cygwin
> before the switch (or some other Cygwin person, who documents what's
> needed).
>
> Not black magic, but it would be nice to do (actually have it work).
>
> -----Original Message-----
> From: vlc-devel-bounces at videolan.org [mailto:vlc-devel-bounces at videolan.org 
> ]
> On Behalf Of Pierre d'Herbemont
> Sent: Monday, February 18, 2008 8:27 PM
> To: Mailing list for VLC media player developers
> Subject: [vlc-devel] Switching to git (2)
>
> 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.
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> http://mailman.videolan.org/listinfo/vlc-devel
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> http://mailman.videolan.org/listinfo/vlc-devel
>