Return-Path: X-Original-To: apmail-hbase-dev-archive@www.apache.org Delivered-To: apmail-hbase-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 81F0C11B3A for ; Fri, 23 May 2014 23:38:57 +0000 (UTC) Received: (qmail 74447 invoked by uid 500); 23 May 2014 23:38:57 -0000 Delivered-To: apmail-hbase-dev-archive@hbase.apache.org Received: (qmail 74355 invoked by uid 500); 23 May 2014 23:38:57 -0000 Mailing-List: contact dev-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list dev@hbase.apache.org Received: (qmail 74347 invoked by uid 99); 23 May 2014 23:38:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 May 2014 23:38:57 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of yuzhihong@gmail.com designates 209.85.160.173 as permitted sender) Received: from [209.85.160.173] (HELO mail-yk0-f173.google.com) (209.85.160.173) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 May 2014 23:38:51 +0000 Received: by mail-yk0-f173.google.com with SMTP id 142so4544552ykq.4 for ; Fri, 23 May 2014 16:38:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=hzaK2tpeIyO7FDzJOcimkZZVNk4NNjyQVhseZMPJbFU=; b=QA9xO2+ZIwcmwftT6PVXNJgmZO3abELsQtsfWqnvbyxLnw4fH4naDQeUsoGna1aW+0 rVV/eOPYY5/f2ao51ETa7ehWWDwgDGzd64G+xGuC5VyJ5XESr1Z2lihGQkDMq7f+sWdG Gj4N6CpNQRRslqSrjWJCWkRx/zgwx92+nkLD0BdUwPpOJs7Lz8Xfmk0Vjg9uIig3G9Y6 7GJcO+7mAVb/RShvGdQjYaL2QW20yn3PHSoiONvB0iJRPeZdHDN0dkxj19Wy8DZMrbzz eseVQfSx2uVotWUD+Uqm4VFT0uUxWdrv5zBK8LEp5BlV9Jbz+ZPJQMRbEPaN/lzEof8m GOOA== MIME-Version: 1.0 X-Received: by 10.236.144.137 with SMTP id n9mr11694694yhj.89.1400888311053; Fri, 23 May 2014 16:38:31 -0700 (PDT) Received: by 10.170.37.144 with HTTP; Fri, 23 May 2014 16:38:30 -0700 (PDT) In-Reply-To: References: <1400883177.21629.YahooMailNeo@web140601.mail.bf1.yahoo.com> <20140523222227.GD6333@boudnik.org> Date: Fri, 23 May 2014 16:38:30 -0700 Message-ID: Subject: Re: We have our first victim From: Ted Yu To: "dev@hbase.apache.org" Content-Type: multipart/alternative; boundary=20cf303dd74a26848d04fa19ba49 X-Virus-Checked: Checked by ClamAV on apache.org --20cf303dd74a26848d04fa19ba49 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable It is a good idea to disable force push. On Fri, May 23, 2014 at 4:13 PM, Enis S=C3=B6ztutar wr= ote: > Force push should be disabled by default for all branches I think. > > Enis > > > On Fri, May 23, 2014 at 3:35 PM, Andrew Purtell > wrote: > > > Makes sense, earlier Jake was talking about how 'trunk' is a "protected > > branch". > > > > > > On Fri, May 23, 2014 at 3:22 PM, Konstantin Boudnik > > wrote: > > > > > I think INFRA only disables force-pushes to the master: the rest of t= he > > > branches is a fair game ;) > > > > > > Cos > > > > > > On Fri, May 23, 2014 at 03:12PM, lars hofhansl wrote: > > > > I just had to fix up the history on the 0.94 branch, because I forg= ot > > to > > > > rebase after a pull (and I had some committed changes already). > > > > > > > > git will happily let you push stuff, even if that messes up the > history > > > (and > > > > reorder commits, in my case my local change was ordered before the > > pulled > > > > changes). > > > > It's not wrong, since I should have rebased my changes. Just... > uhm... > > > surprising :) > > > > > > > > > > > > Scary, but it worked and at least git gives me enough tools to fix > > > things. > > > > > > > > -- Lars > > > > > > > > > > > > > > > > ________________________________ > > > > From: Andrew Purtell > > > > To: "dev@hbase.apache.org" > > > > Sent: Friday, May 23, 2014 10:22 AM > > > > Subject: We have our first victim > > > > > > > > > > > > Ram pushed up a commit as a new branch 'trunk' instead of to > 'master'. > > I > > > > will file an infra ticket to nuke the new branch 'trunk' as this is > > going > > > > to confuse people. Objections? > > > > > > > > -- > > > > Best regards, > > > > > > > > =E2=95=90 - Andy > > > > > > > > Problems worthy of attack prove their worth by hitting back. - Piet > > Hein > > > > (via Tom White) > > > > > > > > > > > -- > > Best regards, > > > > - Andy > > > > Problems worthy of attack prove their worth by hitting back. - Piet Hei= n > > (via Tom White) > > > --20cf303dd74a26848d04fa19ba49--