As I announced earlier, Shorewall is transitioning from SVN to Git for SCM. The first step was to create a Git repository from the SVN repository at Sourceforge. The second step was to upload the Git repository back to Sourceforge. I''ve been attempting to maintain both the SVN and Git repositories at Sourceforge in parallel and am finding that attempting to syncronize back and forth with updates to both SVN and to Git are problemmatic. In particular, syncronizing with SVN often backs out recent changes from my local repository! Rather than fight these problems, I''m going to simply stop updating trunk in the SVN repository at Sourceforge. All trunk development going forward will only be pushed to the Git repository. If you have a change that you want to include in trunk and you have not yet cloned the Git repository at SF (which is quite easy, BTW) send me a unified diff patch and I will apply the patch to my local tree and update Git. Thanks! -Tom -- Tom Eastep \ When I die, I want to go like my Grandfather who Shoreline, \ died peacefully in his sleep. Not screaming like Washington, USA \ all of the passengers in his car http://shorewall.net \________________________________________________ ------------------------------------------------------------------------------ Stay on top of everything new and different, both inside and around Java (TM) technology - register by April 22, and save $200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco. 300 plus technical and hands-on sessions. Register today. Use priority code J9JMT32. http://p.sf.net/sfu/p
Tom Eastep wrote:> As I announced earlier, Shorewall is transitioning from SVN to Git for SCM. > > The first step was to create a Git repository from the SVN repository at > Sourceforge. > > ... > Rather than fight these problems, I''m going to simply stop updating > trunk in the SVN repository at Sourceforge. All trunk development going > forward will only be pushed to the Git repository.Can anyone recommend a 1-minute crash course/survival kit for us git-ignorant plebs? Git is otherwise very low on my priority list. Paul ------------------------------------------------------------------------------ Stay on top of everything new and different, both inside and around Java (TM) technology - register by April 22, and save $200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco. 300 plus technical and hands-on sessions. Register today. Use priority code J9JMT32. http://p.sf.net/sfu/p
Paul Gear wrote:> Tom Eastep wrote: >> As I announced earlier, Shorewall is transitioning from SVN to Git for SCM. >> >> The first step was to create a Git repository from the SVN repository at >> Sourceforge. >> >> ... >> Rather than fight these problems, I''m going to simply stop updating >> trunk in the SVN repository at Sourceforge. All trunk development going >> forward will only be pushed to the Git repository. > > Can anyone recommend a 1-minute crash course/survival kit for us > git-ignorant plebs? Git is otherwise very low on my priority list.http://git.or.cz/course/svn.html Git Quick Start at http://git-scm.com/ http://p.sf.net/sourceforge/git -Tom -- Tom Eastep \ When I die, I want to go like my Grandfather who Shoreline, \ died peacefully in his sleep. Not screaming like Washington, USA \ all of the passengers in his car http://shorewall.net \________________________________________________ ------------------------------------------------------------------------------ Stay on top of everything new and different, both inside and around Java (TM) technology - register by April 22, and save $200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco. 300 plus technical and hands-on sessions. Register today. Use priority code J9JMT32. http://p.sf.net/sfu/p
On Tue, Apr 21, 2009 at 06:23:55AM +1000, Paul Gear wrote:> Tom Eastep wrote: > > As I announced earlier, Shorewall is transitioning from SVN to Git for SCM. > > > > The first step was to create a Git repository from the SVN repository at > > Sourceforge. > > > > ... > > Rather than fight these problems, I''m going to simply stop updating > > trunk in the SVN repository at Sourceforge. All trunk development going > > forward will only be pushed to the Git repository. > > Can anyone recommend a 1-minute crash course/survival kit for us > git-ignorant plebs? Git is otherwise very low on my priority list.To grab a copy of the tree initially: git clone giturl To update it later: git pull (from inside the git tree) Handy things: git log - shows changes git log filename - shows changes that involved that file git log -Sfoobar filename - shows changes that involved that file and the keyword foobar git checkout v2.4 - switch the state of the tree to v2.4 tag git checkout master - switch the state of the tree to the head git show 1234567890abcdef - show commit 1234567890abcdef git diff v2.4 - show diff between current and v2.4 tag. git add - Add file to tree git commit - Commit changes to tracked files as a changeset. There are lots of useful things too like git mv (rename), git tag (manage tags) git revert (revert a changeset), etc. -- Len Sorensen ------------------------------------------------------------------------------ Stay on top of everything new and different, both inside and around Java (TM) technology - register by April 22, and save $200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco. 300 plus technical and hands-on sessions. Register today. Use priority code J9JMT32. http://p.sf.net/sfu/p