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.
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
