From owner-svn-doc-head@FreeBSD.ORG  Tue May 29 12:46:34 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 15443106566C;
	Tue, 29 May 2012 12:46:34 +0000 (UTC)
	(envelope-from issyl0@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D9A918FC0A;
	Tue, 29 May 2012 12:46:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4TCkXpd077881;
	Tue, 29 May 2012 12:46:33 GMT (envelope-from issyl0@svn.freebsd.org)
Received: (from issyl0@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4TCkXeq077879;
	Tue, 29 May 2012 12:46:33 GMT (envelope-from issyl0@svn.freebsd.org)
Message-Id: <201205291246.q4TCkXeq077879@svn.freebsd.org>
From: Isabell Long <issyl0@FreeBSD.org>
Date: Tue, 29 May 2012 12:46:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r38928 - head/en_US.ISO8859-1/articles/committers-guide
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the doc tree for head
	<svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
	<mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
	<mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 May 2012 12:46:34 -0000

Author: issyl0
Date: Tue May 29 12:46:33 2012
New Revision: 38928
URL: http://svn.freebsd.org/changeset/doc/38928

Log:
  Update the vendor imports section of the Subversion Primer to reflect changes
  in the wiki page.
  
  Reviewed by:	gavin
  Approved by:	gabor (mentor)

Modified:
  head/en_US.ISO8859-1/articles/committers-guide/article.sgml

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.sgml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.sgml	Tue May 29 05:31:22 2012	(r38927)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.sgml	Tue May 29 12:46:33 2012	(r38928)
@@ -2462,6 +2462,47 @@ $target - head/$source:$P,$Q,$R</screen>
 	    from a consistent state with old code, to a consistent
 	    state with new code.</para>
 	</sect4>
+
+	<sect4>
+	  <title>From scratch</title>
+
+	  <sect5>
+	    <title>Importing into the vendor tree</title>
+
+	    <para>This section is an example of importing and tagging
+	      <application>baycc</application> into
+	      <filename class="directory">head</filename>.</para>
+
+	    <para>First, prepare the directory in
+	      <filename class="directory">vendor</filename>:</para>
+
+	    <screen>&prompt.user; <userinput>svn co --depth immediates <replaceable>$FSVN/vendor</replaceable></userinput>
+&prompt.user; <userinput>cd <replaceable>vendor</replaceable></userinput>
+&prompt.user; <userinput>svn mkdir <replaceable>byacc</replaceable></userinput>
+&prompt.user; <userinput>svn mkdir <replaceable>byacc/dist</replaceable></userinput></screen>
+
+	    <para>Now, import the sources into the
+	      <filename class="directory">dist</filename> directory.  Once
+	      the files are in place, <command>svn add</command> the new
+	      ones, then <command>svn commit</command> and tag the
+	      imported version.  To save time and bandwidth, direct remote
+	      committing and tagging is possible:</para>
+
+	    <screen>&prompt.user; <userinput>svn cp -m <replaceable>"Tag byacc 20120115"</replaceable> <replaceable>$FSVN/vendor/byacc/dist</replaceable> <replaceable>$FSVN/vendor/byacc/byacc-20120115</replaceable></userinput></screen>
+	  </sect5>
+
+	  <sect5>
+	    <title>Merging to head</title>
+
+	    <para>Due to this being a new file, copy it for the
+	      merge:</para>
+
+	    <screen>&prompt.user; <userinput>svn cp -m <replaceable>"Import byacc to contrib"</replaceable> <replaceable>$FSVN/vendor/byacc/dist</replaceable> <replaceable>$FSVN/head/contrib/byacc</replaceable></userinput></screen>
+
+	    <para>Working normally on newly imported sources is still
+	      possible.</para>
+	  </sect5>
+	</sect4>
    </sect3>
 
    <sect3>