Date: Sat, 10 Jan 2015 00:01:14 +0000 (UTC) From: Benjamin Kaduk <bjk@FreeBSD.org> 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 Message-ID: <201501100001.t0A01Eub066876@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 @@ </sponsor> </project> + <project cat='proj'> + <title>Git integration</title> + + <contact> + <person> + <name>Git discussion list</name> + <email>freebsd-git@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="https://lists.freebsd.org/mailman/listinfo/freebsd-git" /> + <url href="https://www.kernel.org/pub/software/scm/git/docs/git-svn.html" /> + <url href="https://github.com/git/git/commit/83c9433e679635f8fbf8961081ea3581c93ca778" /> + <url href="https://wiki.freebsd.org/GitWorkflow" /> + <url href="https://github.com/freebsd/freebsd" /> + <url href="https://bugs.freebsd.org/bugzilla" /> + </links> + + <body> + <p>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:</p> + + <ul> + <li>&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.</li> + + <li>&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.</li> + + <li>&a.alfred; updated the Git Workflow wiki document to + include information for using git-svn to commit to the FreeBSD + Subversion repository.</li> + + <li>&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.</li> + </ul> + </body> + + <help> + <task> + <p>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.</p> + </task> + </help> + </project> + </report>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501100001.t0A01Eub066876>