Date: Tue, 29 May 2012 12:46:33 +0000 (UTC) From: Isabell Long <issyl0@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r38928 - head/en_US.ISO8859-1/articles/committers-guide Message-ID: <201205291246.q4TCkXeq077879@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205291246.q4TCkXeq077879>