From owner-freebsd-git@FreeBSD.ORG Mon Nov 17 21:43:47 2014 Return-Path: Delivered-To: git@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9D414ED6; Mon, 17 Nov 2014 21:43:47 +0000 (UTC) Received: from elvis.mu.org (elvis.mu.org [IPv6:2001:470:1f05:b76::196]) by mx1.freebsd.org (Postfix) with ESMTP id 8A89CAFD; Mon, 17 Nov 2014 21:43:47 +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 D2368341F870; Mon, 17 Nov 2014 13:43:46 -0800 (PST) Message-ID: <546A6C12.5000701@mu.org> Date: Mon, 17 Nov 2014 13:43:46 -0800 From: Alfred Perlstein User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: =?UTF-8?B?VWxyaWNoIFNww7ZybGVpbg==?= Subject: Re: Wiki updates that might interest people. References: <546935FF.10105@mu.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Cc: git@freebsd.org X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.18-1 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, 17 Nov 2014 21:43:47 -0000 On 11/17/14, 12:48 PM, Ulrich Spörlein wrote: > 2014-11-17 0:40 GMT+01:00 Alfred Perlstein : >> Hey folks, >> >> I've updated the wiki with better instructions on how to use git-svn and >> commit to FreeBSD. >> >> Right now we are sort of blocked adding new files until >> https://reviews.freebsd.org/D1154, but until then you can rebuild git with >> those changes and .... IT WORKSS!!! > Woohoo, thanks for digging up those patches and testing them! > >> Updated bootstrap instructions here: >> https://wiki.freebsd.org/GitWorkflow#Using_git-svn_.28FreeBSD_committers_only.29 >> >> Updated how to merge pull requests here: >> https://wiki.freebsd.org/GitWorkflow#Merging_pull_requests_from_github_using_git-svn_.28FreeBSD_committers_only.29 > I fear this page is becoming a little unreadable over time. The topic > creeped from just getting a src clone, to covering all the various > bases. And no, I don't have a good idea how to structure them better. > Some feedback from the community as to what needs to be documented and > what is hard to understand would help, I guess. Sure, we can break the page up I don't mind. Open to ideas. > >> Anyhow, the instructions have been updated to show you how to take pull >> requests from github and commit them directly to the tree. > I have never worked with phabricator, but how do people upload patches > there? Can I "patch-bomb" it and send out my reviews with git somehow? YES!!!! it's "super easy": # assuming /usr/src is git and on branch 'master' # AND 'origin' is the freebsd git repo: # /usr/src % git remote -v | grep origin # origin https://github.com/freebsd/freebsd (fetch) # origin https://github.com/freebsd/freebsd (push) cd /usr/src git checkout your_branch arc diff $(git merge-base origin/master YOUR_TOPIC_BRANCH) The cool part is that so long as you keep running "arc diff $(git merge-base origin/master YOUR_TOPIC_BRANCH)" it will update the existing phabricator. -Alfred > Cheers, > Uli >