Git integration

From owner-svn-doc-head@FreeBSD.ORG Sat Jan 10 00:01:14 2015 Return-Path: Delivered-To: svn-doc-head@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 542F8764; Sat, 10 Jan 2015 00:01:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F7C5182; Sat, 10 Jan 2015 00:01:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0A01EEZ066877; Sat, 10 Jan 2015 00:01:14 GMT (envelope-from bjk@FreeBSD.org) Received: (from bjk@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0A01Eub066876; Sat, 10 Jan 2015 00:01:14 GMT (envelope-from bjk@FreeBSD.org) Message-Id: <201501100001.t0A01Eub066876@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bjk set sender to bjk@FreeBSD.org using -f From: Benjamin Kaduk Date: Sat, 10 Jan 2015 00:01:14 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46179 - head/en_US.ISO8859-1/htdocs/news/status X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jan 2015 00:01:14 -0000 Author: bjk Date: Sat Jan 10 00:01:13 2015 New Revision: 46179 URL: https://svnweb.freebsd.org/changeset/doc/46179 Log: Add entry for git integration Approved by: hrs (mentor, blanket) Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2014-10-2014-12.xml Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2014-10-2014-12.xml ============================================================================== --- head/en_US.ISO8859-1/htdocs/news/status/report-2014-10-2014-12.xml Fri Jan 9 23:53:27 2015 (r46178) +++ head/en_US.ISO8859-1/htdocs/news/status/report-2014-10-2014-12.xml Sat Jan 10 00:01:13 2015 (r46179) @@ -1386,4 +1386,77 @@ + + Git integration + + + + Git discussion list + freebsd-git@FreeBSD.org + + + + + + + + + + + + + +

Several &os; developers have expressed interest in improving + the tools and documentation to facilitate the use of the Git + source code management (SCM) system when working with &os; code. + Some highlights of the work in this area include the following:

+ +

&a.alfred; requested the creation of a new mailing list + freebsd-git@FreeBSD.org. This list is for discussion of + git use in the FreeBSD project.
&a.alfred; submitted a patch to git. This patch allows a + developer to work on a source code tree in git and use git-svn to + push changes from this tree directly to a Subversion repository + and set Subversion properties. Before this patch, git-svn did not + properly set Subversion properties. This is important for &os; + developers because the &os; Subversion repo will block commits + which do not properly set certain Subversion properties. The git + project accepted this change in changeset 83c9433.
&a.alfred; updated the Git Workflow wiki document to + include information for using git-svn to commit to the FreeBSD + Subversion repository.
&a.robak; wrote a script which integrates Github and + &os; Bugzilla. When a user files a Github pull + request against the &os; source code tree on Github, this script + will open a new PR in &os; Bugzilla. This will allow users to + contribute code and patches via Github pull requests, and have the + request tracked by &os; developers in Bugzilla. Github pull + requests cannot currently be directly merged into the &os; source + tree on Github, because the main source code repository is + currently Subversion. The &os; source code tree on Github is a + read-only mirror of the &os; Subversion repository. &a.rodrigc; + coordinated with &a.robak; and bugmeister@FreeBSD.org to move + forward on this, and provide &a.robak; with enough access to + Bugzilla to open PR's via a script.

+ + + + +

The Github integration script is not deployed yet and + is not active for all pull requests against the &os; source tree + on Github. &a.robak; and bugmeister@FreeBSD.org need to work out + the final details for deploying this script into production. The + script must be accessible via HTTP POST requests because it uses + the Github REST API. &a.robak; and bugmeister@FreeBSD.org need to + reach agreement on where this script lives, and do a security + audit.

+ + + +