Thanks so much Adam - this is really helpful for all of us. Cheers, Ruppert -- Tim Ruppert HotWax Media http://www.hotwaxmedia.com
o:801.649.6594 f:801.649.6595 On Dec 9, 2009, at 4:30 PM, Adam Heath wrote: > [email protected] wrote: >> Author: doogie >> Date: Wed Dec 9 22:10:37 2009 >> New Revision: 889000 >> >> URL: http://svn.apache.org/viewvc?rev=889000&view=rev >> Log: >> Fix for missing runtime/output. >> >> Modified: >> ofbiz/branches/release09.04/framework/build.xml >> >> Modified: ofbiz/branches/release09.04/framework/build.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/build.xml?rev=889000&r1=888999&r2=889000&view=diff >> ============================================================================== >> --- ofbiz/branches/release09.04/framework/build.xml (original) >> +++ ofbiz/branches/release09.04/framework/build.xml Wed Dec 9 22:10:37 2009 >> @@ -102,7 +102,7 @@ >> >> <target name="clean-output"> >> <delete verbose="on"> >> - <fileset dir="../runtime/output" includes="*"/> >> + <fileset dir="." includes="../runtime/output/*"/> >> </delete> >> </target> > > This and the previous commit were done using git. Doing git-svn > management of svn branches is a little odd, so I'll attempt to explain it. > > Normally, when you git-svn clone, you'll get a copy of trunk, all > tags, and all branches, inside the refs/remotes/$foo location. Then, > there is an automatic local branch created, called master, that is > based on refs/remotes/trunk. The normal git add/git commit/git svn > dcommit/git svn fetch/git svn rebase commands work as described in the > master/trunk link. > > For other branches, the local git branch has to be set up by hand first. > > For ofbiz, this is the series of steps I did. > == > git branch -l > git branch -r > git checkout -b local-release09.04 release09.04 > vim > vim > git add > git commit > git commit > git svn dcommit .... > git co master > vim > vim > git commit > git co local-release09.04 > vim > git commit > git svn dcommit > git co master > vim > git commit > git svn dcommit > == > > Throw in a few git stash/git stash apply to save any changes I don't > want to commit just yet, and you have a window into my workflow.
smime.p7s
Description: S/MIME cryptographic signature
