[PATCH 10 of 14] docs/usage: move Mercurial subrepository info to VCS support page

Thomas De Schampheleire patrickdepinguin at gmail.com
Mon Apr 6 15:12:04 EDT 2015


# HG changeset patch
# User Thomas De Schampheleire <thomas.de.schampheleire at gmail.com>
# Date 1428260622 -7200
#      Sun Apr 05 21:03:42 2015 +0200
# Node ID 8cbb14b53fe4559a6f200266a2812c4a1a1bec48
# Parent  1541ad7e1155e512fd76d8e9d7e2446631516656
docs/usage: move Mercurial subrepository info to VCS support page

This commit moves the information verbatim, text changes will be done in a
subsequent commit.

diff --git a/docs/index.rst b/docs/index.rst
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -32,7 +32,6 @@
    usage/locking
    usage/statistics
    usage/backup
-   usage/subrepos
    usage/debugging
    usage/troubleshooting
 
diff --git a/docs/usage/subrepos.rst b/docs/usage/subrepos.rst
deleted file mode 100644
--- a/docs/usage/subrepos.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-.. _subrepos:
-
-=============================================
-Working with Kallithea and Mercurial subrepos
-=============================================
-
-Example usage of Subrepos with Kallithea::
-
-    ## init a simple repo
-    hg init repo1
-    cd repo1
-    echo "file1" > file1
-    hg add file1
-    hg ci --message "initial file 1"
-
-    #clone subrepo we want to add
-    hg clone http://kallithea.local/subrepo
-
-    ## use path like url to existing repo in Kallithea
-    echo "subrepo = http://kallithea.local/subrepo" > .hgsub
-
-    hg add .hgsub
-    hg ci --message "added remote subrepo"
-
-
-In the file list of a clone of ``repo1`` you will see a connected
-subrepo at the revision it was at during cloning. Clicking in
-subrepos link should send you to the proper repository in Kallithea.
-
-Cloning ``repo1`` will also clone the attached subrepository.
-
-Next we can edit the subrepo data, and push back to Kallithea. This will update
-both of the repositories.
-
-See http://mercurial.aragost.com/kick-start/en/subrepositories/ for more
-information about subrepositories.
diff --git a/docs/usage/vcs_support.rst b/docs/usage/vcs_support.rst
--- a/docs/usage/vcs_support.rst
+++ b/docs/usage/vcs_support.rst
@@ -44,6 +44,41 @@
     use_threadpool =
 
 
+Mercurial support
+-----------------
+
+Working with Mercurial subrepositories
+``````````````````````````````````````
+Example usage of Subrepos with Kallithea::
+
+    ## init a simple repo
+    hg init repo1
+    cd repo1
+    echo "file1" > file1
+    hg add file1
+    hg ci --message "initial file 1"
+
+    #clone subrepo we want to add
+    hg clone http://kallithea.local/subrepo
+
+    ## use path like url to existing repo in Kallithea
+    echo "subrepo = http://kallithea.local/subrepo" > .hgsub
+
+    hg add .hgsub
+    hg ci --message "added remote subrepo"
+
+
+In the file list of a clone of ``repo1`` you will see a connected
+subrepo at the revision it was at during cloning. Clicking in
+subrepos link should send you to the proper repository in Kallithea.
+
+Cloning ``repo1`` will also clone the attached subrepository.
+
+Next we can edit the subrepo data, and push back to Kallithea. This will update
+both of the repositories.
+
+See http://mercurial.aragost.com/kick-start/en/subrepositories/ for more
+information about subrepositories.
 
 .. _waitress: http://pypi.python.org/pypi/waitress
 .. _gunicorn: http://pypi.python.org/pypi/gunicorn


More information about the kallithea-general mailing list