SF.net SVN: matplotlib:[6878] trunk/matplotlib/doc/devel/coding_guide.rst

[<as...@us...>]

Revision: 6878
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6878&view=rev
Author:   astraw
Date:     2009-02-04 21:48:49 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
more git instructions

Modified Paths:
--------------
    trunk/matplotlib/doc/devel/coding_guide.rst

Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst	2009-02-04 21:44:05 UTC (rev 6877)
+++ trunk/matplotlib/doc/devel/coding_guide.rst	2009-02-04 21:48:49 UTC (rev 6878)
@@ -224,6 +224,14 @@
   git checkout whizbang-branch
   git rebase master
 
+If you get the dreaded "Unable to determine upstream SVN information
+from working tree history" error when running "git svn rebase", try
+creating a new git branch based on subversion trunk and cherry pick
+your patches onto that::
+
+  git checkout -b work remotes/trunk # create a new "work" branch
+  git cherry-pick <commit> # where <commit> will get applied to new branch
+
 Working on a maintenance branch from git
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.