[med-svn] r24075 - trunk/community/website/docs
Andreas Tille
tille at moszumanska.debian.org
Fri Sep 22 09:19:26 UTC 2017
Author: tille
Date: 2017-09-22 09:19:25 +0000 (Fri, 22 Sep 2017)
New Revision: 24075
Modified:
trunk/community/website/docs/policy.xml
Log:
SVN now deprecated
Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml 2017-09-22 08:48:27 UTC (rev 24074)
+++ trunk/community/website/docs/policy.xml 2017-09-22 09:19:25 UTC (rev 24075)
@@ -213,8 +213,19 @@
│ └ debian/
…</programlisting>
</para>
- <para>
- If you touch a package in SVN you should do the following to migrate it to Git:
+ </sect2>
+ <sect2 id="subversion-to-git">
+ <title>Migration of a source package from Subversion to Git</title>
+ <para>
+ If you touch a package in SVN you should consider strongly to move the packaging to Git.
+ </para>
+ <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.
<programlisting>
svn checkout svn://anonscm.debian.org/debian-med/trunk/helper-scripts
cd helper-scripts
@@ -287,14 +298,6 @@
<literal>debian/debianversion</literal> and upstream releases are
tagged with names like <literal>upstream/upstreamversion</literal>.
</para>
- <para>
- <command>gbp buildpackage</command> can be set to a directory layout
- similar to the one we use with <command>svn-buildpackage</command> by
- using the <literal>export-dir</literal> and <literal>tarball-dir</literal>
- options. However those settings should only be in a system-wide or
- user-wide <filename>gbp.conf</filename> file and not the one committed
- in the Git repository.
- </para>
</sect3>
<sect3 id="git-without-tarball">
<title>Social Git</title>
@@ -492,43 +495,6 @@
</para>
</sect3>
</sect2>
-
- <sect2 id="subversion-to-git">
- <title>Migration of a source package from Subversion to Git.</title>
- <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>
- <para>Start the conversion as explained in the <ulink url="http://wiki.debian.org/Alioth/Git#ConvertaSVNAliothrepositorytoGit">Alioth/Git</ulink> page of the Debian wiki. To be consistent with a later usage of <command>gbp buildpackage</command>, it is preferable to prefix the tag names <quote>debian</quote>. During this conversion, you can take advantage of the file <filename>/trunk/helper-scripts/debian-med-authors</filename> in the Subversion repository, and expand it if necessary.</para>
- <programlisting>svn checkout svn+ssh://svn.debian.org/svn/debian-med/trunk/helper-scripts/debian-med-authors</programlisting>
- <para>You can also use the script <filename>/trunk/helper-scripts/convert_svn_2_git</filename> that tries to implement the
- <ulink url="http://wiki.debian.org/Alioth/Git#ConvertaSVNAliothrepositorytoGit">Wiki page</ulink> but be aware that the
- tags from SVN are lost (enhancements / fixes are welcome).</para>
- </listitem>
- <listitem>
- <para>Import of the upstream original tarballs that you find relevant, for instance the ones that were part of a stable release). When this paragraph was written, it was necessary to follow special instruction detailed in <ulink url="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=471560">bug 471560</ulink>.
- </para>
- </listitem>
- <listitem>
- <para>Upload to git.debian.org/git/debian-med and set up the hooks and other meta-data as explained in the <ulink url="http://wiki.debian.org/Alioth/Git">Alioth/Git</ulink> page of the Debian wiki.
- </para>
- </listitem>
- <listitem>
- <para>Document in the Subversion repository that the package has been transferred elsewhere, for instance with a file named <filename>README.status</filename> containing the new VCS URL.</para>
- </listitem>
- <listitem>
- <para>Delete the package in the Subversion repository after its VCS URL in Stable has been updated by the next release.</para>
- </listitem>
- </itemizedlist>
- <para>It is also possible to prepare a Git repository containing some of the package's history using the command <command>gbp import-dscs --debsnap</command> from the helper toolkit <command>gbp buildpackage</command>. This will download all the versions of a package available in <ulink url="http://snapshot.debian.org">snapshots.debian.org</ulink> and create tags for each of them. Note that as this paragraph is written, the tool is not aware that <emphasis>backports</emphasis> should be a different branch</para>
- </sect2>
<sect2 id="updating-git-package">
<title>Updating a source package managed with Git</title>
<para>Most source packages maintained as Git repositories in Debian Med are using the <command>gbp buildpackage</command> helper toolkit. In doubt, try this one first.</para>
@@ -698,13 +664,10 @@
<listitem>
<formalpara id="vcs-url">
- <title>Vcs-Svn: and Vcs-Browser:</title>
+ <title>Vcs-Git: and Vcs-Browser:</title>
<para>Please use the following templates, and refer to the Debian Policy
<ulink url="http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-VCS-fields">§ 5.6.26</ulink>
for details:<programlisting>
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/<package>/trunk/
-Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/<package>/trunk/</programlisting>
- or<programlisting>
Vcs-Browser: http://anonscm.debian.org/cgit/debian-med/<package>.git
Vcs-Git: git://anonscm.debian.org/debian-med/<package>.git</programlisting>
</para>
@@ -857,20 +820,10 @@
<sect2 id="vcs">
<title>Version control systems</title>
<para>
- We are currently using two different version control systems, Subversion and Git.
+ We are forced to use Git since SVN support will be droped. As
+ explained above <link linkend="subversion-to-git">above</link>
+ we are migrating the formerly used SVN to Git.
</para>
- <sect3 id="vcs-svn">
- <title>Source package stored in a Subversion repository</title>
- <para>
- 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>
- <option>-o</option> <filename>package.dsc</filename> <filename
- class="directory">svn+ssh://svn.debian.org/svn/debian-med/trunk/packages/</filename></code>.
- </para>
- </sect3>
<sect3 id="vcs-git">
<title>Source package stored in a Git repository</title>
<para>
@@ -915,7 +868,7 @@
<title>The Debian Med Blend tasks</title>
<para>
Once you injected a new package please make sure that it is mentioned
- in the appropriate <link linkend="tasks">tasks</link> file in the SVN
+ in the appropriate <link linkend="tasks">tasks</link> file in the Git
source of the <package>debian-med</package> Blend package. Some team
members watch the changes in the Debian Med packaging pool but it helps
if the maintainer of a new package verifies that everything is in the
More information about the debian-med-commit
mailing list