annotate docs/usage/subrepos.rst @ 4845:3a3ec35466e7

templates: move site branding in page title to base template Instead of repeating the same three lines in each and every template, move it to the base template.
author Thomas De Schampheleire <thomas.de_schampheleire@alcatel-lucent.com>
date Mon, 23 Feb 2015 22:11:38 +0100
parents e73a69cb98dc
children 03bbd33bc084
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
1 .. _subrepos:
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
2
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
3 =============================================
4192
e73a69cb98dc Rename some strings examples and commands in documentation
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3224
diff changeset
4 working with Kallithea and mercurial subrepos
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
5 =============================================
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
6
4192
e73a69cb98dc Rename some strings examples and commands in documentation
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3224
diff changeset
7 example usage of Subrepos with Kallithea::
3224
8b8edfc25856 whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3073
diff changeset
8
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
9 ## init a simple repo
3224
8b8edfc25856 whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3073
diff changeset
10 hg init repo1
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
11 cd repo1
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
12 echo "file1" > file1
3224
8b8edfc25856 whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3073
diff changeset
13 hg add file1
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
14 hg ci --message "initial file 1"
3224
8b8edfc25856 whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3073
diff changeset
15
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
16 #clone subrepo we want to add
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
17 hg clone http://rc.local/subrepo
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
18
4192
e73a69cb98dc Rename some strings examples and commands in documentation
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3224
diff changeset
19 ## use path like url to existing repo in Kallithea
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
20 echo "subrepo = http://rc.local/subrepo" > .hgsub
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
21
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
22 hg add .hgsub
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
23 hg ci --message "added remote subrepo"
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
24
3224
8b8edfc25856 whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3073
diff changeset
25
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
26
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
27 In file list of repo1 you will see a connected subrepo at revision it was
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
28 during cloning.
4192
e73a69cb98dc Rename some strings examples and commands in documentation
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3224
diff changeset
29 Clicking in subrepos link should send you to proper repository in Kallithea
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
30
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
31 cloning repo1 will also clone attached subrepository.
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
32
4192
e73a69cb98dc Rename some strings examples and commands in documentation
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3224
diff changeset
33 Next we can edit the subrepo data, and push back to Kallithea. This will update
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
34 both of repositories.
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
35
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
36 see http://mercurial.aragost.com/kick-start/en/subrepositories/ for more
3224
8b8edfc25856 whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3073
diff changeset
37 information about subrepositories