AROS m68k-amiga: Difference between revisions

From www.evillabs.net
Jump to navigation Jump to search
Line 1: Line 1:
= Make a really fast clone of all of AROS SVN, ''and'' be able to git svn dcommit =
= Make a really fast clone of all of AROS SVN, ''and'' be able to git svn dcommit =


== AROS.git ==
== Fetching AROS.git ==


* git clone git://repo.or.cz/AROS.git
* git clone git://repo.or.cz/AROS.git
Line 11: Line 11:
* git checkout -b master-svn refs/remotes/git-svn
* git checkout -b master-svn refs/remotes/git-svn


== AROS-Contrib.git ==
== Fetching AROS-Contrib.git ==


* cd AROS
* cd AROS
Line 22: Line 22:
* git svn fetch (under a minute or so)
* git svn fetch (under a minute or so)
* git checkout -b master-svn refs/remotes/git-svn
* git checkout -b master-svn refs/remotes/git-svn
== 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)

Revision as of 16:51, 28 October 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)