[Pywps-dev] development workflow update

[Tom Kralidis]

More thoughts:

Given current master and pywps-4 branches have totally different
commit histories, it is not possible to simply merge pywps-4 into
master via GitHub pull request.  One option we could consider is using
the "ours" merge strategy:

git checkout pywps-4
git merge -s ours master
git checkout master
git merge pywps-4
git push -f origin master

This essentially pushes pywps-4 into master branch without wiping out
master branch history.

..Tom


On Tue, Feb 9, 2016 at 4:28 PM, Tom Kralidis <tomkralidis at gmail.com> wrote:
>
> Hi all: FYI the following have been completed
> against https://github.com/geopython/pywps:
>
> - master branch is up to date
> - issues / milestones are up to date and represent 3.x and 4.x plans
> - branch pywps-4 represents our PyWPS 4 effort
> - branch pywps-3.2 represents our 3.x development.  At this point in time
> any
>   fixes in master that apply to 3.x should be also applied to branch
> pywps-3.2
> - any further 3.x releases are to built/tagged/released off branch pywps-3.2
>
> At some point branch pywps-4 will be merged as master and pywps-3.2 will be
> our 3.x support branch.  From that point forward, any changes in master
> should _not_ be applied to branch pywps-3.2 given the backward
> compability break.
>
> I'd like to hear thoughts on pywps-4 -> master efforts and when folks
> think is a good time to move that over.  The idea here is that we have
> supported releases (3.2.3) to download or pip install, and master
> represents development.  Does anyone have any knowledge that master
> is being used operationally anywhere (which is a bad idea given it's
> not a release).
>
> Cheers
>
> ..Tom