<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><div>On Feb 20, 2008, at 7:27 AM, Loren Merritt wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite">On Tue, 19 Feb 2008, Pierre d'Herbemont wrote:<br><br><blockquote type="cite">VLC is considering a switch to git. What would be your thought about<br></blockquote><blockquote type="cite">that?<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">I think it would be wise to switch with us at the same time as we<br></blockquote><blockquote type="cite">share the same svn repo.<br></blockquote><br>No objection. I'm happy with svn, but ffmpeg will probably switch <br>sometime, so I have to learn git anyway.</blockquote><br></div><div>Then interested developers should send me an ssh keys.</div><div><br class="webkit-block-placeholder"></div><div>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.</div><div><br class="webkit-block-placeholder"></div><div>Thanks,</div><div><br class="webkit-block-placeholder"></div><div>Pierre.</div><div><br class="webkit-block-placeholder"></div><div>----</div><div>Hi,<br><br>I have re-imported the current trunk with the correct (hopefully) <br>author name, it is available here:<br><a href="http://git2.videolan.org/?p=vlc.git;a=summary">http://git2.videolan.org/?p=vlc.git;a=summary</a><br>(Note that it is not resync-ed automatically with svn, we can do that <br>by hand when needed)<br><br>We are more or less ready to perform the switch, and we just need to <br>agree on a date to perform it (that mean freezing SVN, and making the <br>vlc.git writable).<br><br>A small summary:<br>* We are using gitosis for the administration of the repos. It is very <br>convenient.<br>* We do need a public key for each committer. Please send me yours.<br>* You are strongly encouraged to play a bit with vlc-sandrox to <br>familiarize with git<br>* You need to fix up your email address prior committing<br>* There are several way to work with git, for now I guess that the <br>typical commands that match our current svn usage are:<br>$ git clone <a href="mailto:git@git2.videolan.org">git@git2.videolan.org</a>:vlc-sandrox.git<br>$ git commit -a (no equivalent)<br>$ git commit myfile (no equivalent)<br>$ git pull --rebase # svn up<br>$ git push (svn commit)<br><br>A small note on git pull:<br>Basically when using git and committing locally you are indeed working <br>on your own branch, so a simple git pull will create a merge object <br>and merge your local branch to the upstream. That's not how svn works.<br>git pull --rebase will put your work on top of the latest commit in <br>upstream and will act as svn does.<br><br>Have fun,<br><br>Pierre.<br></div></body></html>