From owner-svn-doc-head@FreeBSD.ORG  Mon Feb 10 17:29:57 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5D02E3B6;
 Mon, 10 Feb 2014 17:29:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2C26513B6;
 Mon, 10 Feb 2014 17:29:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1AHTvpb028673;
 Mon, 10 Feb 2014 17:29:57 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1AHTvBE028672;
 Mon, 10 Feb 2014 17:29:57 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402101729.s1AHTvBE028672@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 10 Feb 2014 17:29:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43863 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Mon, 10 Feb 2014 17:29:57 -0000

Author: wblock
Date: Mon Feb 10 17:29:56 2014
New Revision: 43863
URL: http://svnweb.freebsd.org/changeset/doc/43863

Log:
  Add a tip to the Vendor Imports with SVN section showing how to deal
  with vendor merges for packages which were in the tree before the
  cvs2svn conversion.
  
  Submitted by:	gshapiro@
  Reviewed by:	gshapiro@

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

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon Feb 10 16:16:59 2014	(r43862)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon Feb 10 17:29:56 2014	(r43863)
@@ -1826,6 +1826,29 @@ U    stable/9/share/man/man4/netmap.4
 	    Subversion that it should not complain because merge
 	    conflicts will be taken care of manually.</para>
 
+	  <tip xml:id="svn-advanced-use-vendor-imports-pre-svn">
+	    <para>The <command>cvs2svn</command> changeover occurred
+	      on June 3, 2008.  When performing vendor merges for
+	      packages which were already present and converted by the
+	      <command>cvs2vn</command> process, the command used to
+	      merge
+	      <filename>/vendor/<replaceable>package_name</replaceable>/dist</filename>
+	      to
+	      <filename>/head/<replaceable>package_location</replaceable></filename>
+	      (for example,
+	      <filename>head/contrib/sendmail</filename>) must use
+	      <option>-c <replaceable>REV</replaceable></option> to
+	      indicate the revision to merge from the
+	      <filename>/vendor</filename> tree.  For example:</para>
+
+	    <screen>&prompt.user; <userinput>svn checkout svn+ssh://svn.freebsd.org/base/head/contrib/<replaceable>sendmail</replaceable></userinput>
+&prompt.user; <userinput>cd sendmail</userinput>
+&prompt.user; <userinput>svn merge -c r<replaceable>261190</replaceable> ^/vendor/<replaceable>sendmail/dist</replaceable> .</userinput></screen>
+
+	    <para><literal>^</literal> is an alias for the the
+	      repository path.</para>
+	  </tip>
+
 	  <para>It is necessary to resolve any merge conflicts.
 	    This process is the same in <acronym>SVN</acronym> as in
 	    <acronym>CVS</acronym>.</para>