Walter, to backport to 14.x you need a new pull request. We have a great guide here:
http://docs.geotools.org/latest/developer/procedures/git.html#porting-changes-across-primary-branches git makes branches very easy. I use a new branch for every nontrivial change. I like to keep my major branches in sync with the main repo. Feature branches get pushed to my personal repo for a PR and review. Rule #1 of backports: no merging across primary branches. Instead use cherry-pick or squash merge to make new commits on the destination primary branch that do not share history with the old primary branch. PR 991 has a bunch of commits; this backport is an opportunity to squash these into one for clarity with "cherry-pick -n" or a squash merge. I name my GeoTools remotes geotools for the main repo and by my github id for my personal repo for my personal repo. You might need to tinker with these lines if your remotes have different names. First make a local 14.x branch tracking the main repo: git checkout -b 14.x geotools/14.x git pull Now make a feature branch off this: git branch -b fix-oracle-unwrap-14.x Apply all the changes on this branch, but squash them together and do not commit (-n): git cherry-pick -n 7967c7de91e61fca3e7c65f3400bfcce1cda1549 4737d994da8085160a9d688eb5c9f7287cfcffb0 54406ba3cec56b856eb88242d7d56c957b764908 b7382db8529f95a3f14e6abc0209f02d8b9f6748 Might be a good idea to run the tests again for this branch to check that everything works as you expect. Now make your new commit: git commit -am "[GEOT-5239] Fix OracleDialect.unwrap() to work when wrapped by LifeCycleConnection" Use a tool like gitk to check that the history and changes are as desired. It is easy to inadvertently omit or include files, but using cherry-pick should help prevent this. Push to a new remote branch in your personal repo (assuming you have added it as a remote by the name wmstoval): git push wmstoval fix-oracle-unwrap-14.x and then you are ready to make a new github PR for geotools/14.x . Kind regards, Ben. On 22/10/15 21:24, Walter Stovall wrote: > I'm using geoserver 2.8 as the basis for an upcoming release of my project. > But I'll need for geotools to include the fix in pull request 991 > https://github.com/geotools/geotools/pull/991. Since geoserver 2.8 wants > geotools 14.x how can I get this pull request back ported to 14.x? Would > that be a new pull request that references the 991 pull request? Do I need > to setup a build of geotools with my changes manually applied? > > Advice is appreciated! > > Thanks - Walter > > > > ------------------------------------------------------------------------------ > > > > _______________________________________________ > GeoTools-Devel mailing list > GeoTools-Devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/geotools-devel > -- Ben Caradoc-Davies <b...@transient.nz> Director Transient Software Limited <http://transient.nz/> New Zealand ------------------------------------------------------------------------------ _______________________________________________ GeoTools-Devel mailing list GeoTools-Devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geotools-devel
