Author: plessy
Date: 2011-12-11 02:57:01 +0000 (Sun, 11 Dec 2011)
New Revision: 8886
Modified:
trunk/community/website/docs/policy.xml
Log:
Soften wording about mergeWithUpstream to avoid implying it is used everywhere.
Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml 2011-12-11 02:27:48 UTC (rev
8885)
+++ trunk/community/website/docs/policy.xml 2011-12-11 02:57:01 UTC (rev
8886)
@@ -206,7 +206,7 @@
alias <command>svn-bt</command>='svn-buildpackage --svn-tag
-rfakeroot'</programlisting>
</para>
<para id="svn-mergewithupstream">
- <command>svn-inject</command> sets up correctly
the
+ <command>svn-inject
<replaceable>-o</replaceable></command> sets up 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
@@ -455,11 +455,14 @@
<sect2 id="subversion-to-git">
<title>Migration of a source package from Subversion to
Git.</title>
- <para>There is no easy way to prepare a Git repository from
our Subversion repository that would
- look like the package was always managed in Git,
because we use svn-buildpackage with the
- mergeWithUpstream property set, which excludes the
upstream sources. Nevertheless, the
- following recipe will generate a Git repository that
contains all the history of
- the debian directory, plus a collection of selected
upstream source releases.
+ <para>
+ For packages were we set the
<literal>mergeWithUpstream</literal>
+ property, which excludes the upstream sources, there is no
easy way to
+ prepare a Git repository from our Subversion repository
that would look
+ like the package was always managed in Git. Nevertheless,
the following
+ recipe will generate a Git repository that contains all the
history of
+ the debian directory, plus a collection of selected
upstream source
+ releases.
</para>
<itemizedlist>
<listitem>
@@ -660,8 +663,8 @@
<sect3 id="vcs-svn">
<title>Source package stored in a Subversion
repository</title>
<para>
- We use the
<literal>mergeWithUpstream</literal> workflow, so please
- keep all the modifications in the
<filename
+ We often use the
<literal>mergeWithUpstream</literal> workflow. In
+ that case, please keep all the
modifications in the <filename
class="directory">debian</filename>
directory, and use the
<option>-o</option> option of
<command>svn-buildpackage</command>, as
in the following example:
<code><command>svn-inject</command>
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
