os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update the vendor imports section of the Subversion Primer to reflect changes

Browse source 
in the wiki page.

Reviewed by:	gavin
Approved by:	gabor (mentor)
This commit is contained in:
Isabell Long 2012-05-29 12:46:33 +00:00
parent 494e3441ea
commit 40e13b78cd
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=38928
1 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -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>