[petsc-dev] 'master' RESET after bad merge! - 'tisaac/thplex' was based on 'next'

[Jed Brown]

Satish Balay <balay at mcs.anl.gov> 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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20140903/472bc8a3/attachment.sig>