From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 10:17:55 2008 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7423610656B2; Thu, 9 Oct 2008 10:17:55 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6261D8FC1E; Thu, 9 Oct 2008 10:17:55 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m99AHtQK058080; Thu, 9 Oct 2008 10:17:55 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m99AHtHZ058079; Thu, 9 Oct 2008 10:17:55 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <200810091017.m99AHtHZ058079@svn.freebsd.org> From: Peter Wemm Date: Thu, 9 Oct 2008 10:17:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r183722 - projects X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Oct 2008 10:17:55 -0000 Author: peter Date: Thu Oct 9 10:17:55 2008 New Revision: 183722 URL: http://svn.freebsd.org/changeset/base/183722 Log: Merge from user/GUIDELINES.txt Modified: projects/GUIDELINES.txt (contents, props changed) Modified: projects/GUIDELINES.txt ============================================================================== --- projects/GUIDELINES.txt Thu Oct 9 10:13:33 2008 (r183721) +++ projects/GUIDELINES.txt Thu Oct 9 10:17:55 2008 (r183722) @@ -5,7 +5,7 @@ Rule #1: TAKE IT EASY! DON'T RUSH AND M Rule #2: See rule #1, repeat as needed Peril sensitive sunglasses advisory: -This is in flux. Expect refinement. +This is in flux. Expect refinement. Expect typos. Guidelines for what can go in /user and /projects ------------------------------------------------- @@ -56,7 +56,7 @@ Creation and merging: Merging is in flux. The procedure as understood right now: -Assue projects/ia65/sys. $BASE="svn+ssh://svn.freebsd.org/base" +Assume projects/ia65/sys. $BASE="svn+ssh://svn.freebsd.org/base" Initial creation: $ svn cp --parents $BASE/head/sys $BASE/projects/ia65/sys @@ -73,11 +73,14 @@ To integrate changes from head into your To merge your changes into head/sys. $ mail -s 'Is it ok to merge projects/ia65 to head?' peter@freebsd.org - $ wait_for_reply + $ wait_for_reply (the point is to have somebody on hand for the first + timeto help rescue you if things go horribly wrong.) (set up a clean checkout of head/sys and projects/ia65/sys. MUST BE CLEAN!!) $ cd work $ svn co $BASE/head/sys $ svn co $BASE/projects/ia65/sys + (If you've already got clean checkouts handy, replace with appropriate + svn update commands) $ svn info head - NOTE CHANGE NUMBER!!! assume 12345 for this example. (now, bring projects/ia65 up to date with head, AS YOU JUST CHECKED IT OUT) $ svn merge $BASE/head/sys@12345 projects/ia65/sys @@ -89,6 +92,8 @@ To merge your changes into head/sys. (resolve conflicts) $ svn commit head/sys $ profit! + (regular svn users might wonder about merge --reintegrate. Our tree breaks + it, sorry. We can't use it.) Tags: Place tags in your /user area if possible, even if the origin is a project.