Mercurial > kallithea
changeset 4971:9cef5a168b88
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.
| author | Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> |
|---|---|
| date | Sun, 05 Apr 2015 21:03:42 +0200 |
| parents | 601282d36c06 |
| children | b52a1ccee927 |
| files | docs/index.rst docs/usage/subrepos.rst docs/usage/vcs_support.rst |
| diffstat | 3 files changed, 35 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/index.rst Sun Apr 05 20:46:21 2015 +0200 +++ b/docs/index.rst Sun Apr 05 21:03:42 2015 +0200 @@ -32,7 +32,6 @@ usage/locking usage/statistics usage/backup - usage/subrepos usage/debugging usage/troubleshooting
--- a/docs/usage/subrepos.rst Sun Apr 05 20:46:21 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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.
--- a/docs/usage/vcs_support.rst Sun Apr 05 20:46:21 2015 +0200 +++ b/docs/usage/vcs_support.rst Sun Apr 05 21:03:42 2015 +0200 @@ -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