Satish Balay <[email protected]> writes: > Wrt next branch - one thing we can do: > > Have a tag say in petscversion.h or petscbranch.h > #define PETSC_BRANCH next
We can use remote tracking branches to mark the commit that should not ever be brought in by a merge. Still doesn't avoid people from asking to merge rebased commits, but it prevents merging 'next'. > And now the trigger script can always check this file - and prevent a > 'push' to any branch other than next. [I'm assuming the trigger script > is on the server side - so it won't prevent a merge to maint/master - > but a push to maint/master] Can't do it on the server because bitbucket and github are (wisely) staying out of this error-prone business in which nobody is ever satisfied. You have to install hooks on the user's computer. And if the hooks need to be updated, you have to do that update without messing up private hooks that the user configured.
pgpCGzvsi0hBy.pgp
Description: PGP signature
