Author: plessy
Date: 2009-11-03 14:08:42 +0000 (Tue, 03 Nov 2009)
New Revision: 4307
Modified:
trunk/community/website/docs/policy.xml
Log:
Document briefly our Git repository.
Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml 2009-11-03 13:32:12 UTC (rev
4306)
+++ trunk/community/website/docs/policy.xml 2009-11-03 14:08:42 UTC (rev
4307)
@@ -98,22 +98,31 @@
</sect2>
</sect1>
<sect1>
- <title>Subversion</title>
- <para>Our Subversion (SVN) repository is currently hosted on
+ <title>Repositories</title>
+ <para>We use Subversion (SVN) and Git repositories, hosted on
<ulink url="http://alioth.debian.org/";>Alioth</ulink>, the
hosting
facility provided by Debian to free software developers. You
can have a look at
- the repository through Alioth's <ulink
url="http://svn.debian.org/wsvn/debian-med/trunk/?rev=0&sc=0";>web</ulink>
- <ulink
url="http://svn.debian.org/viewsvn/debian-med";>interfaces</ulink>.</para>
+ each repository through Alioth's web interfaces: <ulink
url="http://svn.debian.org/wsvn/debian-med/trunk/?rev=0&sc=0";>wsvn</ulink>
+ <ulink
url="http://svn.debian.org/viewsvn/debian-med";>viewsvn</ulink> and
+ <ulink url="http://git.debian.org/";>gitweb</ulink>.</para>
+ <para>The Subversion repository is the primary location for our
source packages.
+ However, the Git repository is free to use for special cases,
for instance when
+ the Subversion tags take a disproportionated size, when the
maintainer is
+ much more comfortable with Git than Subversion, when some
special features of
+ Git or git-buildpackage are desired, or more simply when the
maintainer wants
+ to thake the opportunity to familiarise with Git.
+ </para>
<sect2>
<title>Give me the source!</title>
<para>
- To check sources out from SVN, please do:
+ To check sources out from our repostitories,
please do:
<itemizedlist>
<listitem>
<para>If you are a member of
Debian Med or a Debian developper, you have write permission:</para>
<blockquote>
<para><userinput>
<command>svn
co</command> <filename
class="directory">svn+ssh://[email protected]/svn/debian-med/trunk/...</filename>
+ <command>git
clone</command> <filename
class="directory">git+ssh://[email protected]/git/debian-med/<package>.git</filename>
</userinput></para>
</blockquote>
<para>You can avoid specifying
your Alioth user name by setting it in
<filename>~/.ssh/config</filename>:</para>
@@ -129,6 +138,7 @@
<blockquote>
<para><userinput>
<command>svn
co</command> <filename
class="directory">svn://svn.debian.org/svn/debian-med/trunk/...</filename>
+ <command>git
clone</command> <filename
class="directory">git://git.debian.org/git/debian-med/<package>.git</filename>
</userinput></para>
</blockquote>
</listitem>
@@ -170,7 +180,31 @@
<note><para>We are currently considering an alternative
layout in which all
the <filename>trunk</filename>,
<filename>tags</filename> and
<filename>branches</filename> directories are grouped
together, so that developpers can checkout trunks without tags.</para></note>
+ <para>The Git repository is not structured: each
package is in its own Git repository.
+ But all of them are under the same
<filename>debian-med</filename> directory.</para>
</sect2>
+ <sect2>
+ <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 receipe will genearate a Git repostitory 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>git-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/community/infrastructure/comitters</filename> in the
Subversion repository, and expand it if necessary.</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 alioth.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>
+ </itemizedlist>
+ </sect2>
</sect1>
<sect1>
<title>Packaging</title>
@@ -251,10 +285,14 @@
<listitem>
<formalpara>
<title>Vcs-Svn: and Vcs-Browser:</title>
- <para>Please use the following template:
+ <para>Please use the following
templates:
<programlisting>
Vcs-Svn:
svn://svn.debian.org/svn/debian-med/trunk/packages/<package>/trunk/
Vcs-Browser:
http://svn.debian.org/wsvn/debian-med/trunk/packages/<package>/trunk/?rev=0&sc=0
+ </programlisting>or
+ <programlisting>
+Vcs-Git: git://git.debian.org/git/debian-med/<package>.git
+Vcs-Browser: http://git.debian.org/?p=debian-med/<package>.git
</programlisting>
</para>
</formalpara>
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
