From owner-freebsd-git@FreeBSD.ORG Mon Jun 2 20:28:54 2014 Return-Path: Delivered-To: freebsd-git@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE3B9717; Mon, 2 Jun 2014 20:28:54 +0000 (UTC) Received: from mail-la0-x22b.google.com (mail-la0-x22b.google.com [IPv6:2a00:1450:4010:c03::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 105DB2114; Mon, 2 Jun 2014 20:28:50 +0000 (UTC) Received: by mail-la0-f43.google.com with SMTP id mc6so2888271lab.2 for ; Mon, 02 Jun 2014 13:28:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:message-id:subject:from:to:cc:content-type; bh=gDa0Khpa5JJjDVPxI/3FxBi/hWyxidSGXvNZpxXJcDI=; b=dTN5yl/RX8USZdnQCPDLXyy64XcbuUct96jM7WsV/h63P2PRxkswKzyagRAKLb7c1M yh5ZuQtOLtgM3hQkT9ZSnopTqBEV7huBHAUr1W9vbq+Tn4OARhfsmsXK5iAHfd/ZmyTO 7rivGwpnnoYg4+OsgzKuFq18B0btt4Ig+9HN4bggW/u/HZ5WYU97ez+fArluyFiaphUa pIxf0o+xeT3Ev8PZnkOcwvUtpDqMNEdghNOqOTwlxqg2IvhwDIHtL0zj7Pfco/bl/YOh Z63gT2vEMdEH5gCLW+2tZab6tqqjXFXJzNWlXGK/jPmP+WNXK+iVPEFmhCSJYqGei3px EtSw== MIME-Version: 1.0 X-Received: by 10.152.43.43 with SMTP id t11mr3470548lal.89.1401740928997; Mon, 02 Jun 2014 13:28:48 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.112.67.73 with HTTP; Mon, 2 Jun 2014 13:28:48 -0700 (PDT) Date: Mon, 2 Jun 2014 13:28:48 -0700 X-Google-Sender-Auth: QksB3BDAGXeeP7ooKy8FP9rivo8 Message-ID: Subject: Tracking FreeBSD in a 3rd party product using git From: Craig Rodrigues To: Alfred Perlstein Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-git@freebsd.org X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2014 20:28:54 -0000 Hi, In this talk: http://www.ixsystems.com/whats-new/tracking-freebsd-in-freenas-by-using-git-for-newbies/ In the section "Talking about the rebase operation", there seems to be some text missing which illustrates that actual "git rebase" command used. Do you have another copy of the presentation with the full text? I think it is OK to have this on the iXsystems blog, but I would rather see a copy of this on wiki.freebsd.org. This document is super useful. Recently, I rebased FreeNAS from FreeBSD 9 to FreeBSD 10. It took me only a few days to do the rebase and resolve conflicts. Using something like Subversion, it probably would have taken me weeks. My opinion is that we should really promote using git as a good, solid way to track FreeBSD in a third party product. -- Craig From owner-freebsd-git@FreeBSD.ORG Mon Jun 2 21:26:06 2014 Return-Path: Delivered-To: freebsd-git@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 41691D81; Mon, 2 Jun 2014 21:26:06 +0000 (UTC) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 2DF1826B3; Mon, 2 Jun 2014 21:26:05 +0000 (UTC) Received: from u10-2-32-011.office.norse-data.com (unknown [50.204.88.51]) by elvis.mu.org (Postfix) with ESMTPSA id E997B1A3C4B; Mon, 2 Jun 2014 14:26:04 -0700 (PDT) Message-ID: <538CEBF2.9090200@freebsd.org> Date: Mon, 02 Jun 2014 14:26:10 -0700 From: Alfred Perlstein Organization: FreeBSD User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Craig Rodrigues Subject: Re: Tracking FreeBSD in a 3rd party product using git References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-git@freebsd.org X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2014 21:26:06 -0000 On 6/2/14, 1:28 PM, Craig Rodrigues wrote: > Hi, > > In this talk: > > http://www.ixsystems.com/whats-new/tracking-freebsd-in-freenas-by-using-git-for-newbies/ > > In the section "Talking about the rebase operation", > there seems to be some text missing which illustrates that > actual "git rebase" command used. > > Do you have another copy of the presentation with the full text? > > I think it is OK to have this on the iXsystems blog, > but I would rather see a copy of this on wiki.freebsd.org. > > This document is super useful. Recently, I rebased > FreeNAS from FreeBSD 9 to FreeBSD 10. It took me only a few days > to do the rebase and resolve conflicts. Using something like Subversion, > it probably would have taken me weeks. > > My opinion is that we should really promote using git as a good, solid > way to track FreeBSD in a third party product. > > -- > Craig Thanks Craig, more information is available here: http://splbio.wordpress.com/2012/11/24/basing-a-commercial-product-on-freebsd-using-git/ I can find some information on finding out the --onto, I really thought I had uploaded this somewhere, but it has disappeared. I will check my laptop when I get home to find the entirety of the notes I have for this talk. -Alfred From owner-freebsd-git@FreeBSD.ORG Wed Jun 11 01:31:08 2014 Return-Path: Delivered-To: freebsd-git@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 22A04435 for ; Wed, 11 Jun 2014 01:31:08 +0000 (UTC) Received: from guerrillamail.com (mail.guerrillamail.com [198.143.169.10]) by mx1.freebsd.org (Postfix) with ESMTP id BF7BC2869 for ; Wed, 11 Jun 2014 01:31:07 +0000 (UTC) Received: by 198.143.169.10 with HTTP; Wed, 11 Jun 2014 01:30:52 +0000 MIME-Version: 1.0 Message-ID: <300de4d04e7987d0eff739206072d4ef7766@guerrillamail.com> Date: Wed, 11 Jun 2014 01:30:52 +0000 To: "freebsd-git@freebsd.org" From: Subject: Git, finally :) X-Originating-IP: [37.130.227.133] Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Domain-Signer: PHP mailDomainSigner 0.2-20110415 DKIM-Signature: v=1; a=rsa-sha1; s=better; d=guerrillamail.com; l=378; t=1402450256; c=relaxed/relaxed; h=to:from:subject; bh=FG52+MICRswkNEXkOf0L3TcQ/mI=; b=Euu99Ys0q82xTyH6ehgfBkVRUXIPHw2N1/lulDT1Mlyz48yShG4i8z11yMrQEOj4 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jun 2014 01:31:08 -0000 Wow a list dedicated to git. Finally it seems FreeBSD is getting with the p= rogram. And no more legacy dead weight, cvs/svn, lol. Totally hoping to see= the main repo converted from svn to git soon. Thx guys.=0A=0A=0A=0A=0A=0A-= ---=0ASent using GuerrillMail.com=0ABlock or report abuse: https://www.guer= rillamail.com/abuse/?a=3DR1NxAA8TR%2FkSgRqU9mwadxbUSYSfwNA%3D=0A From owner-freebsd-git@FreeBSD.ORG Mon Jun 30 15:16:09 2014 Return-Path: Delivered-To: git@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4C25BF87; Mon, 30 Jun 2014 15:16:09 +0000 (UTC) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 3C38E2256; Mon, 30 Jun 2014 15:16:06 +0000 (UTC) Received: from AlfredMacbookAir.local (c-76-21-10-192.hsd1.ca.comcast.net [76.21.10.192]) by elvis.mu.org (Postfix) with ESMTPSA id 6A7EB1A3C1B; Mon, 30 Jun 2014 08:16:05 -0700 (PDT) Message-ID: <53B17F55.3040106@freebsd.org> Date: Mon, 30 Jun 2014 08:16:37 -0700 From: Alfred Perlstein Organization: FreeBSD User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: git@freebsd.org, uqs@freebsd.org Subject: most efficient means for pushing code from git to FreeBSD svn? Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2014 15:16:09 -0000 Hey folks, I am looking for the most efficient means to take code from git and push it into FreeBSD svn. I know for some time there was a git-svn bridge setup for http://github.com/freebsd/freebsd.git, however now when I google around looking for steps on how to use it I get some conflicting information. A few questions: 1) Does the git-svn bridge still exist? 2) Where is the most up to date page on how to do this? 3) Does this work for branches such as 10-stable (or is the git-svn branch only good for -current)? 4) If the git-svn branch is only good for -current, how hard is it to make one for 10-stable? how hard for other branches? 5) Are we still blocked by the requirement for setting "fbsd-keywords"? Thank you, -Alfred From owner-freebsd-git@FreeBSD.ORG Tue Jul 1 10:56:54 2014 Return-Path: Delivered-To: git@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A6888340; Tue, 1 Jul 2014 10:56:54 +0000 (UTC) Received: from acme.spoerlein.net (unknown [IPv6:2a02:2528:fa:1000::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.spoerlein.net", Issuer "CAcert Class 3 Root" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 23096212D; Tue, 1 Jul 2014 10:56:53 +0000 (UTC) Received: from localhost (acme.spoerlein.net [IPv6:2a02:2528:fa:1000::1]) by acme.spoerlein.net (8.14.9/8.14.9) with ESMTP id s61AupG5003216 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 1 Jul 2014 12:56:51 +0200 (CEST) (envelope-from uqs@FreeBSD.org) Date: Tue, 1 Jul 2014 12:56:51 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Alfred Perlstein Subject: Re: most efficient means for pushing code from git to FreeBSD svn? Message-ID: <20140701105651.GA2140@acme.spoerlein.net> References: <53B17F55.3040106@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <53B17F55.3040106@freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: git@freebsd.org X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2014 10:56:54 -0000 On Mon, 2014-06-30 at 08:16:37 -0700, Alfred Perlstein wrote: > Hey folks, > > I am looking for the most efficient means to take code from git and push > it into FreeBSD svn. > > I know for some time there was a git-svn bridge setup for > http://github.com/freebsd/freebsd.git, however now when I google around > looking for steps on how to use it I get some conflicting information. > > A few questions: > > 1) Does the git-svn bridge still exist? git-svn exists, so I'm not sure what you're asking. There is no special converter or bridge process running, you just use git(1) to talk the svn protocol with an svn server. > 2) Where is the most up to date page on how to do this? https://wiki.freebsd.org/GitWorkflow#Using_git-svn_.28FreeBSD_committers_only.29 > 3) Does this work for branches such as 10-stable (or is the git-svn > branch only good for -current)? It should work for any branch, but we only provide already made conversions for -CURRENT and I don't trust git-svn enough to handle merge information properly. Please use svn merge to do your MFCs or be prepared to muck around with svn mergeinfo to get everything recorded properly in svn. > 4) If the git-svn branch is only good for -current, how hard is it to > make one for 10-stable? how hard for other branches? Trivial, but takes some wall clock time. git-svn spectacularly failed for me when trying to convert all the branches, but a handful should be fine. I have to piece this back togeher from memory, but something like this should work: git svn init -Tstable/10 svn+ssh://svn.freebsd.org/base freebsd-10 then 'git svn fetch' for the initial sync and use 'git svn rebase' periodically to move your local master/trunk up to what stable/10 has on the svn side. You should be able to combine all of those branches in a single workspace for easy git diff and saved storage thanks to repacking. > 5) Are we still blocked by the requirement for setting "fbsd-keywords"? I believe so, but haven't done any commits for some time now. It would only take someone to patch git-svn to do the right thing for our repository ... Cheers, Uli