Re:What's New in Mercurial 3.0
by Crito on Tuesday April 29, 2014 @05:20PM
(#7670031)
"Git", (really, whatever git server you are using for your publicly accessible repo) only allows you to do that if you allow it to allow you to do that. Rejecting non-fast-forward commits is standard practice in every git shop that I've worked in.
[ Parent
| on HN ]
It's also the default these days.
$ git init --bare --shared foo.git
Initialized empty shared Git repository in foo.git/
$ cat foo.git/config
# ...
[receive]
denyNonFastforwards = true
Re:What's New in Mercurial 3.0
by anton_gogolev on Tuesday April 29, 2014 @05:52PM
(#7670171)
I love just how persistent is Git in confusing users. Double negative, anyone?
It's not a double negative...denying non-FFs != allowing FFs.
The positive statement would be "onlyFastForwardMerges=true" or "mergesMustBeFastForward=true"
why not:
[receive] onlyFastForwards = true
Re:What's New in Mercurial 3.0
by SoftwareMaven on Tuesday April 29, 2014 @07:36PM
(#7670635)
We use git rewriting extensively and do allow non-FF commits. We also have process and tools in place such that master is held sacred (and our live branch is untouchable). Every once in a blue moon, a master branch will get a non-FF, and our tooling is such that we make sure everyone knows it happened.
However, we are a small team consisting of mostly Linux kernel developers, so that may influence the level of trust we put in not screwing things up. We also work pretty much independently; were that not the case, this would get ugly.
Re:What's New in Mercurial 3.0
by JoshTriplett on Tuesday April 29, 2014 @07:48PM
(#7670685)
> However, we are a small team consisting of mostly Linux kernel developers
What team is that, and what are you working on?
Re:What's New in Mercurial 3.0
by SoftwareMaven on Tuesday April 29, 2014 @09:55PM
(#7671140)
Oracle Ksplice[1]: patches the kernel with security updates without rebooting.