|
|
On 12/01/2017 02:52 AM, clipka wrote:
...
>
> `release/v3.8.0` is where we maintain the version that's ultimately
> going to become v3.8.0.
>
> `master` is where we maintain any changes that are to be released in a
> later version.
>
...
This last statement is of course why those of us with patches/branches
create and maintain them off the 'master' branch - whether or not our
work is aimed at POV-Ray proper.
While I understand the resource constraints, the 'master' branch
breaking over time due environmental changes - and not getting timely
updates for such breakage - effectively stalls, or makes more
complicated(1), ongoing fix/feature development.
In addition, the master branch falling considerably behind makes it more
likely future re-bases of our branches to master will be messy.
Bill P.
(1) - I've started to use git's 'cherry-pick' feature to pull
'release/v3.8.0' commits into my: 'master' + 'all_my_own_branches' +
'some_3.8_stuff' version of POV-Ray. I've not yet needed the tr1 boost
update(s), so I don't have that update handy for pushing onto github for
a possible merge into master. Aside: The change log and other
documentation files are problematic when using the cherry-pick feature
as are multiple-commit-single-fix/features and many-features/fixes
commits...
Post a reply to this message
|
|