Re: Re: del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt
Zend/tests/bug61681.phpt Zend/tests/const_dereference_001.phpt Zend/tests/const_dereference_002.phpt Zend/tests/const_dereference_003.phpt
Zend/tests/empty_with_expr.phpt Zend/tests/isset_expr_error.phpt Zend/tests/isset_func_error.phpt Zend/tests/offset_assign.phpt
Zend/tests/offset_string.phpt Zend/zend.h
On Wed, 2012-07-25 at 17:05 +1000, Ryan McCue wrote:
> Johannes Schlüter wrote:
> > Thanks for the advise! I hope nobody was affected as we had the issue
> > for less than an hour.
>
> Out of interest, why did you use reset --hard rather than revert?
> The latter would have avoided contaminating repositories that had
> already merged it in, and having two commits in the commit history isn't
> that bad.
>
> (The main issue I can think of is with using git blame)
That messes with anybody looking at the history in more or less any
form. It might be the required way if many people pulled in between and
did work on top of the wrong revision, but as we noted it quite quickly
the annoyance for the few who might have pulled in between should be
lower than the long-term pain of a broken history.
johannes
Thread (6 messages)