Author: plessy
Date: 2011-03-21 09:22:02 +0000 (Mon, 21 Mar 2011)
New Revision: 6335

Modified:
   trunk/community/website/docs/policy.xml
Log:
Transferred informations about SVN tags from the policy to the tips.


Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml     2011-03-21 09:11:41 UTC (rev 
6334)
+++ trunk/community/website/docs/policy.xml     2011-03-21 09:22:02 UTC (rev 
6335)
@@ -215,6 +215,21 @@
                                
url="mailto:[email protected]";>mailing list</ulink>
                                (<command>gzip -9</command> it, if it's too 
large).
                        </para>
+                       <para>
+                               It may happen that a package version has been 
uploaded to Debian
+                               repositories, and you forgot to tag the last 
build with
+                               <command>svn-buildpackage --svn-tag</command>.  
You can tag this package
+                               also retroactively.  A first step, creating
+                               the tags directory, can be achieved in two 
ways: either create it
+                               locally as sibling of <filename 
class="directory">trunk/</filename> with
+                               <code><command>svn mkdir</command> <filename 
class="directory">tags</filename></code>, and commit with
+                               <code><command>svn commit</command></code>, or 
create it remotely with
+                               <code><command>svn mkdir</command> <filename 
class="directory">svn+ssh://[email protected]/svn/debian-med/trunk/packages/&lt;package&gt;/tags</filename></code>.
+                               After the tags directory has been created, 
you're ready to tag the
+                               package: 
<code><command>svn-buildpackage</command> <option>--svn-tag-only</option> 
<option>--svn-no-autodch</option></code>.
+                               The <option>--svn-no-autodch</option> avoids
+                               <filename>debian/changelog</filename> to be 
marked as <literal>UNRELEASED</literal>.
+                       </para>
                </sect2>
                <sect2 id="git-repository-structures">
                        <title>Common Git repository structures</title>
@@ -528,6 +543,15 @@
                                        Git repositories managed with a helper 
tool should announce it. For instance, to show that 
<command>git-buildpackage</command> is used, the package can contain a 
configuration file in <filename>debian/gbp.conf</filename>.
                                </para>
                        </sect3>
+                       <sect3 id="vcs-tags">
+                               <title>Tags</title>
+                               <para>
+                                       Tags indicate the revision 
corresponding to uploaded packages. For
+                                       Subversion, the version number is used, 
and for Git,
+                                       <literal>debian/</literal> is added 
before the version number.  In the
+                                       Subversion repository, older tags may 
be deleted to save space.
+                               </para>
+                       </sect3>
                </sect2>
 
                <sect2 id="new-package">
@@ -606,49 +630,6 @@
             </sect3>
             <sect3 id="tagging">
                        <title>Tagging packages</title>
-            <sect4 id="tagging-subversion">
-            <title>Subversion</title>
-                       <para>It may happen that a package version has been 
uploaded to Debian
-                       repositories, and you forgot to tag the last build 
with</para>
-                       <blockquote>
-                               <para><userinput>
-                                       <command>svn-buildpackage 
--svn-tag</command>
-                               </userinput></para>
-                       </blockquote>
-                       <para>
-                               You can tag this package also retroactively. A 
first step, creating
-                               the tags directory, can be achieved in two ways:
-                               <itemizedlist>
-                                       <listitem>
-                                               <para>create it locally (it is 
a sibling of <filename class="directory">trunk/</filename>), and commit:</para>
-                                               <blockquote>
-                                                       <para><userinput>
-                                                               <command>svn 
mkdir</command> <filename class="directory">tags</filename>
-                                                       </userinput></para>
-                                                       <para><userinput>
-                                                               <command>svn 
commit</command>
-                                                       </userinput></para>
-                                               </blockquote>
-                                       </listitem>
-                                       <listitem>
-                                               <para>create it remotely:</para>
-                                               <blockquote>
-                                                       <para><userinput>
-                                                               <command>svn 
mkdir</command> <filename 
class="directory">svn+ssh://[email protected]/svn/debian-med/trunk/packages/&lt;package&gt;/tags</filename>
-                                                       </userinput></para>
-                                               </blockquote>
-                                       </listitem>
-                               </itemizedlist>
-                       </para>
-                       <para>After the tags directory has been created, you're 
ready to tag the
-                       package:</para>
-                       <blockquote>
-                               <para><userinput>
-                                       <command>svn-buildpackage 
--svn-tag-only --svn-no-autodch</command>
-                               </userinput></para>
-                       </blockquote>
-                       <para>(--svn-no-autodch avoids 
<filename>debian/changelog</filename> to be marked as UNRELEASED).</para>
-            </sect4>
                 <sect4 id="tagging-git">
                     <title>Git</title>
                     <para>Tagging a release with git is pretty 
straightforward:</para>


_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit

Reply via email to