[med-svn] r6345 - trunk/community/website/docs

[Charles Plessy]

Author: plessy
Date: 2011-03-21 11:42:59 +0000 (Mon, 21 Mar 2011)
New Revision: 6345

Modified:
   trunk/community/website/docs/policy.xml
Log:
Mention svn propset in the tips.


Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml	2011-03-21 10:21:12 UTC (rev 6344)
+++ trunk/community/website/docs/policy.xml	2011-03-21 11:42:59 UTC (rev 6345)
@@ -199,6 +199,15 @@
 alias <command>svn-br</command>='svn-b --svn-dont-purge --svn-reuse'
 alias <command>svn-bt</command>='svn-buildpackage --svn-tag -rfakeroot'</programlisting>
 			</para>
+			<para id="svn-mergewithupstream">
+				<command>svn-inject</command> sets up correctly the
+				<literal>mergeWithUpstream</literal> property for the SVN directories
+				where packages are stored.  In case <command>svn-inject</command> was
+				not used, you can do it by hand with the command
+				<code><command>svn propset</command>
+				<replaceable>mergeWithUpstream</replaceable>
+				<replaceable>1</replaceable> <replaceable>debian</replaceable></code>.
+			</para>
 			<para id="download-upstream-source">
 				To download the upstream sources (if there is a
 				<filename>debian/watch</filename> file): <code><command>echo