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 A7F3911346 for ; Thu, 22 May 2014 02:42:50 +0000 (UTC) Received: (qmail 61642 invoked by uid 500); 22 May 2014 02:42:50 -0000 Delivered-To: apmail-hbase-dev-archive@hbase.apache.org Received: (qmail 61557 invoked by uid 500); 22 May 2014 02:42:50 -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 61547 invoked by uid 99); 22 May 2014 02:42:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 May 2014 02:42:50 +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 (nike.apache.org: domain of yuzhihong@gmail.com designates 209.85.160.180 as permitted sender) Received: from [209.85.160.180] (HELO mail-yk0-f180.google.com) (209.85.160.180) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 May 2014 02:42:47 +0000 Received: by mail-yk0-f180.google.com with SMTP id q9so2305793ykb.25 for ; Wed, 21 May 2014 19:42:23 -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=H8pMcDHe+rfPytS+6b5Iel4NpKwLqBUuwnSsAVbmyFQ=; b=TMVQpDjJoeKq8+bYcNHq1Z2P90MM9Nt1Jtzdp3rsXyT6roMgAAnq7831ljBhfHc401 z1pQBd18f5ZQEwyW/VS7rGkrIVL1xkBAixp54lnsJo9/l6+VsjE2G5p2+NAi1tnh1WgI bXsE68dkXpBabZBMHu5dvskweub9wzuYl7w+wVvZAsQc9CIURueSGTC3XjETMTkQ+Khx oFEEjR9Rw9OrINVAj+hJic41DMx6fmGHi82uuvJkAOUNk2xhWWpDsNq/INgpMCJA6Pgs rlwH841ihnXFxyCiTIWxSKbIx13HKZ1gleoZrAWWlpEWi8TEYLXUsAEbZ+o8F0TGN0o2 zYYQ== MIME-Version: 1.0 X-Received: by 10.236.191.132 with SMTP id g4mr54770208yhn.32.1400726543205; Wed, 21 May 2014 19:42:23 -0700 (PDT) Received: by 10.170.37.144 with HTTP; Wed, 21 May 2014 19:42:22 -0700 (PDT) In-Reply-To: References: Date: Wed, 21 May 2014 19:42:22 -0700 Message-ID: Subject: Re: ANNOUNCEMENT: Git Migration In Progress (WAS => Re: Git Migration) From: Ted Yu To: "dev@hbase.apache.org" Content-Type: multipart/alternative; boundary=20cf30563c25090a7d04f9f410a2 X-Virus-Checked: Checked by ClamAV on apache.org --20cf30563c25090a7d04f9f410a2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable I 'git clone'd master branch. Ran mvn package. Ran some tests. Checked 'git log' Looks Okay. On Wed, May 21, 2014 at 7:23 PM, Stack wrote: > Migration looks done: https://git-wip-us.apache.org/repos/asf?p=3Dhbase.g= it > > Next up is checking if it is all there. I was going to check later this > evening but if anyone else wants to compare, that'd be grand. > > St.Ack > > > On Wed, May 21, 2014 at 6:04 PM, Andrew Purtell > wrote: > > > I also have done trunk first then cherry pick to branches. > > > > > > On Wed, May 21, 2014 at 4:19 PM, Enis S=C3=B6ztutar > wrote: > > > > > > crew). On feature branches, lets see. Squash if messy history (mo= st > > > > cases?)? > > > > > > > > > > > One immediate example is HBASE-10070 branch. We wanted a smooth merge= , > so > > > the branch history is clean and every commit traces to a jira (with > > reviews > > > etc). > > > > > > For "official" feature branches which will be pushed to the main repo= , > I > > > think we should > > > require a similar thing. If people need a working branch with > less-clean > > > history, there is > > > no need to push that to the asf repo. > > > > > > > > > > The Accumulo doc makes for a good start [1] (ignoring where their > > > branching > > > > style is different to ours). It is informed by the Kafka contributo= rs > > > > workflow doc, also a good read [2]. When in doubt, do as we've done > in > > > the > > > > past: e.g. adding patch to JIRA for hadoopqa run. Dump dev pains an= d > > > > suggested solutions into this thread. Lets keep this thread alive > with > > > > issues we run into as a dev team and our (suggested) solutions. As > our > > > > practice diverges from that outline in docs above, lets note and ad= d > > doc > > > > locally? > > > > > > > > > > +1 for a local doc. > > > I like both of the documents. Kafka does not touch on merge between > > > branches at all. I used to do > > > commit-to-master than cherry-pick in the other branches (if applicabl= e) > > > otherwise create a different patch and commit approach rather > > > than merges across release branches. This is more similar to our svn > > model. > > > > > > I think for existing release branches, the merge is out of question > (if I > > > understand this correctly). We always did trunk-first than cherry-pic= k > > into > > > branches approach, while Accumulo suggests that we do earlier branch > > first, > > > then merge into master. Since I don't have experience on this, > > > not sure whether that will work for us or not. > > > > > > > > > > > > > > I need to heads-up our FB brothers and sisters too.... > > > > > > > > St.Ack > > > > > > > > 1. http://accumulo.apache.org/git.html > > > > 2. > > > > > > > > > > > > > > https://cwiki.apache.org/confluence/display/KAFKA/Patch+submission+and+re= view#Patchsubmissionandreview-Simplecontributorworkflow > > > > > > > > > > > > > > > > > > > > > Perhaps this has some useful formulae: > > > > > > > > > > > > > > > http://git-scm.com/book/en/Customizing-Git-An-Example-Git-Enforced-Policy > > > > > > > > > > > > > > > On Tue, May 20, 2014 at 10:10 PM, Talat Uyarer > > > wrote: > > > > > > > > > > > Good news :) > > > > > > 21 May 2014 08:05 tarihinde "Stack" yazd=C4= =B1: > > > > > > > > > > > > > SVN has been flipped read-only. The migration to git has > > started. > > > > See > > > > > > > https://issues.apache.org/jira/browse/INFRA-7768 > > > > > > > > > > > > > > St.Ack > > > > > > > > > > > > > > > > > > > > > On Mon, May 19, 2014 at 3:56 PM, Stack > wrote: > > > > > > > > > > > > > > > On Mon, May 19, 2014 at 1:48 PM, Talat Uyarer < > > talat@uyarer.com> > > > > > > wrote: > > > > > > > > > > > > > > > >> Hi All, > > > > > > > >> > > > > > > > >> I created an issue for our git migrating. [0] We can follo= w > > our > > > > > > > >> migration status. Fyi > > > > > > > >> > > > > > > > > > > > > > > > > Thank you Talat, > > > > > > > > St.Ack > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -- > > Best regards, > > > > - Andy > > > > Problems worthy of attack prove their worth by hitting back. - Piet Hei= n > > (via Tom White) > > > --20cf30563c25090a7d04f9f410a2--