Return-Path: X-Original-To: apmail-hadoop-general-archive@minotaur.apache.org Delivered-To: apmail-hadoop-general-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5A20429D for ; Wed, 20 Apr 2011 05:59:33 +0000 (UTC) Received: (qmail 63983 invoked by uid 500); 20 Apr 2011 05:59:32 -0000 Delivered-To: apmail-hadoop-general-archive@hadoop.apache.org Received: (qmail 63934 invoked by uid 500); 20 Apr 2011 05:59:31 -0000 Mailing-List: contact general-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: general@hadoop.apache.org Delivered-To: mailing list general@hadoop.apache.org Received: (qmail 63926 invoked by uid 99); 20 Apr 2011 05:59:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Apr 2011 05:59:31 +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 todd@cloudera.com designates 209.85.214.48 as permitted sender) Received: from [209.85.214.48] (HELO mail-bw0-f48.google.com) (209.85.214.48) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Apr 2011 05:59:25 +0000 Received: by bwz8 with SMTP id 8so620086bwz.35 for ; Tue, 19 Apr 2011 22:59:04 -0700 (PDT) Received: by 10.204.16.140 with SMTP id o12mr1448821bka.125.1303279144270; Tue, 19 Apr 2011 22:59:04 -0700 (PDT) MIME-Version: 1.0 Received: by 10.204.38.14 with HTTP; Tue, 19 Apr 2011 22:58:44 -0700 (PDT) In-Reply-To: References: <4112B27D-7DCF-4C8E-AD61-6884BA7E738C@mac.com> <844F39DC-0A5D-4AAE-AF8D-EFD4CC83C18A@mac.com> From: Todd Lipcon Date: Tue, 19 Apr 2011 22:58:44 -0700 Message-ID: Subject: Re: HADOOP-7106: Re-organize hadoop subversion layout To: Nigel Daley Cc: general@hadoop.apache.org, Ian Holsman , "Owen O'Malley" Content-Type: multipart/alternative; boundary=00032555a16e6ffd7a04a15352e0 --00032555a16e6ffd7a04a15352e0 Content-Type: text/plain; charset=ISO-8859-1 On Tue, Apr 19, 2011 at 10:20 PM, Todd Lipcon wrote: > > I'm currently looking into how the git mirrors are setup in Apache-land. > Git-wise, I think we have two options: Option 1) - Create a new git mirror for the new hadoop/ tree. This will have no history. - On the Apache side, fetch the split-project git mirrors into the combined git mirror as branches - eg hadoop-hdfs.git:trunk becomes a branch named something like pre-HADOOP-7106/hdfs/trunk. Thus, when any user fetches, he'll get all the git objects from "prehistory" as well without having to add separate remotes. - Add a script or README file explaining how to set up git grafts on the combined hadoop.git so that the new combination branch "foo" looks like a merge of pre-HADOOP-7106/{hdfs,common,mapred}/foo. Since git grafts are local constructs, each git user would have to run this script once after checking out the git tree, after which the history would be "healed" Pros: - all existing sha1s stay the same. - Any local branches people might have for works in progress should continue to refer to proper SHA1s and should rebase relatively easily onto the combined trunk - Should be reasonably simple to implement Cons: - users have to run a script upon checkout in order to graft back together history Option 2) - Use git-filter-branch on the split repos to rewrite them as if they always took place in their new subdirectories. - Fetch these repos into the merged repo - Set up grafts in the merged repo - Run git-filter-branch --all in the merged repo, which will make the grafts permanent - May have to run git-filter-branch to rewrite some of the git-svn-info: commit messages to trick git-svn. This option basically rewrites history so that it looks like the original project split did what we're planning to do now. Pros: - we have a single cohesive git repo with no need to have users set up grafts Cons: - all of our SHA1s between the original split and now would change (making it harder to rebase local branches for example) - way more opportunity for error, I think. I'm leaning towards option 1 above, and happy to write the script which installs the grafts into the user's local repo. -Todd > >> On Apr 9, 2011, at 11:09 PM, Nigel Daley wrote: >> >> All, >> >> As discussed in Jan/Feb, I'd like to coordinate a date for committing the >> re-organization of our svn layout: >> https://issues.apache.org/jira/browse/HADOOP-7106. I propose Thursday >> April 21 at 11am PDT. >> >> - I will send out reminders leading up to that date. >> - I will announce on IRC when I'm about to start the changes. >> - I will run the script to make the changes. >> - Ian, can you update the asf-authorization-template file and the >> asf-mailer.conf files at the same time? >> - Owen/Todd/Jukka, can you make sure that actions needed by git users are >> taken care of at the same time? (what are these?) >> >> More info on this change is at http://wiki.apache.org/hadoop/ProjectSplit >> >> Cheers, >> Nige >> >> >> > > > -- > Todd Lipcon > Software Engineer, Cloudera > -- Todd Lipcon Software Engineer, Cloudera --00032555a16e6ffd7a04a15352e0--