On Sat, Jun 18, 2011 at 8:10 PM, Justin Deoliveira <[email protected]> wrote: > I am not sure this really warrants a separate branch of documentation... > seems like it could be one line of the build instructions. But it seems > there is pushback to removing the stable developer guide so I'll drop the > topic and hope that doc writers keep remember to keep the two in sync, a > step that i myself have already missed a few times.
Justin, have you tried git+cherry-pick for patch backports? I've been using for a while, quite happy about it (a step above trying to deal with backports in svn imho). Rough steps to follow: - checkout from svn with full tags and branches, with a shallow story if you don't need it all, something like: git svn init -s --prefix=geoserver/ https://svn.codehaus.org/geoserver . git svn fetch -r 16050:HEAD - at this point git branch -r show show all tags and all branches that have had at least one commit between revision 16050 and HEAD (in this case, trunk and 2.1.x) If a new branch is added just run git svn fetch again (this time without revision references) - git svn checkout -b 2-1-x branches/2.1.x - git svn checkout master Now you commit something on master, get its id from git log, and then git checkout 2-1-x git cherry-pick <id> (often this does not generate conflicts, sometimes it does and you have to handle them) <build> git svn dcommit This makes backporting really quick. The version of git I'm using can only do single cherry picks, but I hear the latest can cherry-pick a range of commits. Hope this helps Cheers Andrea -- ------------------------------------------------------- Ing. Andrea Aime GeoSolutions S.A.S. Tech lead Via Poggio alle Viti 1187 55054 Massarosa (LU) Italy phone: +39 0584 962313 fax: +39 0584 962313 http://www.geo-solutions.it http://geo-solutions.blogspot.com/ http://www.youtube.com/user/GeoSolutionsIT http://www.linkedin.com/in/andreaaime http://twitter.com/geowolf ------------------------------------------------------- ------------------------------------------------------------------------------ EditLive Enterprise is the world's most technically advanced content authoring tool. Experience the power of Track Changes, Inline Image Editing and ensure content is compliant with Accessibility Checking. http://p.sf.net/sfu/ephox-dev2dev _______________________________________________ Geoserver-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/geoserver-devel
