...
If you are making changes to PLFM's API and also are changing a client to reflect these changes, then:
(to edit this documentdiagram, goto https://docs.google.com/a/sagebase.org/drawings/d/1X05G5t_8tzW8lQjroQQk3HH9aTHYyvFZfPMg1eckTuU/edit)
...
- run pomVersioner.py to increment version, e.g. from 0.13.1.1 to 0.13.1.12
- push to 0.13.1.1
- push to the client's master branch
...
- run the pomVersioner to increment restore the master's version, e.g. to 0.13.2-SNAPSHOT
...
(to edit, go to : https://docs.google.com/a/sagebase.org/drawings/d/1WUtUpzq1vtbv9nd1o3S3Dq_cUbLoDczDFqZBv3Pl3PI/edit)
Say the latest API-stable branch is 0.13.1.
Pull 1) from PLFM master
- on master, 'git checkout -b 0.13.2' to create the new branch
in the client project, pull from master, changing the version to be the version of the local PLFM snapshot (0.13.2-SNAPSHOT)
work to make client and PLFM work together
in PLFM branch, change version to 0.13.2.n) edit pomVersioner.py so 'newVersion' is 0.14.0; run 'python pomVersioner.py'1 and push
in client master, change version to 0.13.2.1 and push
in PLFM master, merge the branch, change version to 0.13.3-SNAPSHOT and push to remote