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 9862011BDC for ; Thu, 22 May 2014 16:29:27 +0000 (UTC) Received: (qmail 37775 invoked by uid 500); 22 May 2014 16:29:27 -0000 Delivered-To: apmail-hbase-dev-archive@hbase.apache.org Received: (qmail 37691 invoked by uid 500); 22 May 2014 16:29:27 -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 37683 invoked by uid 99); 22 May 2014 16:29:27 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 May 2014 16:29:27 +0000 Received: from localhost (HELO mail-ve0-f177.google.com) (127.0.0.1) (smtp-auth username apurtell, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 May 2014 16:29:26 +0000 Received: by mail-ve0-f177.google.com with SMTP id db11so4718994veb.36 for ; Thu, 22 May 2014 09:29:25 -0700 (PDT) X-Received: by 10.220.163.201 with SMTP id b9mr873189vcy.79.1400776165543; Thu, 22 May 2014 09:29:25 -0700 (PDT) MIME-Version: 1.0 Received: by 10.58.161.19 with HTTP; Thu, 22 May 2014 09:28:45 -0700 (PDT) In-Reply-To: References: From: Andrew Purtell Date: Thu, 22 May 2014 09:28:45 -0700 Message-ID: Subject: Re: ANNOUNCEMENT: Git Migration In Progress (WAS => Re: Git Migration) To: "dev@hbase.apache.org" Content-Type: multipart/alternative; boundary=089e0158ab1ac1d43504f9ff9d7a --089e0158ab1ac1d43504f9ff9d7a Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Infra has closed the migration ticket. I looked at tags for trunk/master and 0.98, and these look fine. Unfortunately there are differences between SVN checkouts and Git checkouts. SVN has changes on trunk/master and 0.98 that did not make it over to Git looks like. master/trunk: http://pastebin.com/dQ6SU2Dz 0.98: http://pastebin.com/Pvk3BH4i 0.96: Good! 0.94: Good! 0.89-fb=E2=80=8B: Good! On Wed, May 21, 2014 at 10:55 PM, Stack wrote: > Thanks T. > > The trunk test is still running fine. Checkout local looks good too. I > tried a branch. It seems right too. Asking about discrepancy in the tag > listings between the branches up in the INFRA issue.git. Working on file > compares of svn and git checkouts.... Will report back. > > St.Ack > > > On Wed, May 21, 2014 at 10:02 PM, Ted Yu wrote: > > > I pointed trunk Jenkins job to git repo and triggered a build. > > > > So far the tests are running fine. > > > > FYI > > > > > > On Wed, May 21, 2014 at 7:42 PM, Ted Yu wrote: > > > > > 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.git > > >> > > >> 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 histor= y > > >> (most > > >> > > > 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 > > >> contributors > > >> > > > 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 pai= ns > > and > > >> > > > 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 a= nd > > add > > >> > 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 > > >> applicable) > > >> > > 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-pick > > >> > 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 < > > talat@uyarer.com> > > >> > > wrote: > > >> > > > > > > >> > > > > > Good news :) > > >> > > > > > 21 May 2014 08:05 tarihinde "Stack" > yazd=C4=B1: > > >> > > > > > > > >> > > > > > > SVN has been flipped read-only. The migration to git ha= s > > >> > 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 > > follow > > >> > our > > >> > > > > > > >> migration status. Fyi > > >> > > > > > > >> > > >> > > > > > > > > > >> > > > > > > > Thank you Talat, > > >> > > > > > > > St.Ack > > >> > > > > > > > > > >> > > > > > > > > >> > > > > > > > >> > > > > > > >> > > > > > >> > > > > >> > > > >> > > > >> > > > >> > -- > > >> > Best regards, > > >> > > > >> > - Andy > > >> > > > >> > Problems worthy of attack prove their worth by hitting back. - Pie= t > > Hein > > >> > (via Tom White) > > >> > > > >> > > > > > > > > > --=20 Best regards, - Andy Problems worthy of attack prove their worth by hitting back. - Piet Hein (via Tom White) --089e0158ab1ac1d43504f9ff9d7a--