Difference between revisions of "AROS m68k-amiga"

From www.evillabs.net
Jump to: navigation, search
(Working with GIT + SVN)
Line 40: Line 40:
 
* ( Compile test )
 
* ( Compile test )
 
* git svn dcommit (push my changes upstream)
 
* git svn dcommit (push my changes upstream)
 +
 +
= Screenshots =
 +
 +
== Nov 2, 2010: Frankrom KS 3.0 ==
 +
 +
[[Image:AROS-M68K-2010-10-02.png]]

Revision as of 23:59, 2 November 2010

Make a really fast clone of all of AROS SVN, and be able to git svn dcommit

Fetching AROS.git

Fetching AROS-Contrib.git

Working with GIT + SVN

There are many 'Using GIT with SVN' tutorials out there, but here's my workflow skeleton:

  • git svn fetch
    • Updates to current SVN tip
  • git checkout -b todays_project git-svn
    • Make a local branch to muck with
    • ( code code code )
  • git gui
    • Make my local commits - no pushes at this point
  • git svn fetch
    • update again, just in case
  • git svn rebase
    • pile my changes on top of current tip
  • ( Compile test )
  • git svn dcommit (push my changes upstream)

Screenshots

Nov 2, 2010: Frankrom KS 3.0

AROS-M68K-2010-10-02.png