[Scummvm-devel] force-push

[Willem Jan Palenstijn]

On Sun, Jan 29, 2012 at 03:37:15PM +0000, Willem Jan Palenstijn wrote:
> Hi all,
> 
> I just did a force-push on master to get rid of a large number of seemingly
> accidentally pushed commits followed by a large revert.
> 
> The bad range was 0ceeee8148..5407bb8fcd.
> 
> LordHoto had already done a number of commits after that, up to 194c0491394,
> which I rebased.
> 
> Unfortunately this total range covered quite a bit of time (8 hours), so there
> may be some people who have the now-removed commits checked out. Please take
> care when pulling not to accidentally merge the removed commits back into
> master.

P.P.P.S. Since this has just happened, fuzzie performed another force-push to
undo that. Please take even more care when pulling not to accidentally merge
the removed commits back into master :-)

Note that there will be no warnings or errors when this happens. The only way
to see is inspecting your local repository using the command line tools or a
graphical repository viewer. (Which is why we do try to avoid force-pushes.)

I can strongly recommend always checking with a repository viewer that what
you're about to push is in fact what you're expecting. (And I always do so
myself, too.)


-Willem Jan