On Tue, May 17, 2011 at 2:56 AM, Andrea Aime
<[email protected]>wrote:
> I'm wondering, if there was some "official" clone of GeoServer on GitHub,
> would that help those people? Could we have some way of treating their
> push requests so that we can grab diffs, apply in svn and move on?
Yes, git patches can be applied to an SVN repository. Assuming we only want
to merge the pull request on one branch (trunk) you could follow these
steps:
git pull git://github.com/<username>/geoserver.git <branch> --squash
# testing, code review
git commit
git svn dcommit
> git push
GitHub normally recognizes when a commit has been merged, but this changes
the commit message to include the SVN revision number so I think we'd have
to manually close the pull request. It might also make some trouble (ie, a
merge conflict if he tries to merge the official branch back onto his
experimental one) but we could mitigate that with documentation.
--
David Winslow
OpenGeo - http://opengeo.org/
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Geoserver-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geoserver-devel