Mercurial > kallithea

annotate docs/usage/subrepos.rst @ 4955:4e6dfdb3fa01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docs: English and consistency corrections
author Michael V. DePalatis <mike@depalatis.net>
date Tue, 31 Mar 2015 22:15:38 +0200
parents 03bbd33bc084
children
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 =============================================
4902
03bbd33bc084 docs: rework stuff
Mads Kiilerich <madski@unity3d.com>
parents: 4192
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
4902
03bbd33bc084 docs: rework stuff
Mads Kiilerich <madski@unity3d.com>
parents: 4192
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
4902
03bbd33bc084 docs: rework stuff
Mads Kiilerich <madski@unity3d.com>
parents: 4192
diff changeset
17 hg clone http://kallithea.local/subrepo
3073
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
4902
03bbd33bc084 docs: rework stuff
Mads Kiilerich <madski@unity3d.com>
parents: 4192
diff changeset
20 echo "subrepo = http://kallithea.local/subrepo" > .hgsub
3073
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
4955
4e6dfdb3fa01 docs: English and consistency corrections
Michael V. DePalatis <mike@depalatis.net>
parents: 4902
diff changeset
26 In the file list of a clone of ``repo1`` you will see a connected
4e6dfdb3fa01 docs: English and consistency corrections
Michael V. DePalatis <mike@depalatis.net>
parents: 4902
diff changeset
27 subrepo at the revision it was at during cloning. Clicking in
4e6dfdb3fa01 docs: English and consistency corrections
Michael V. DePalatis <mike@depalatis.net>
parents: 4902
diff changeset
28 subrepos link should send you to the proper repository in Kallithea.
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
29
4955
4e6dfdb3fa01 docs: English and consistency corrections
Michael V. DePalatis <mike@depalatis.net>
parents: 4902
diff changeset
30 Cloning ``repo1`` will also clone the attached subrepository.
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
31
4192
e73a69cb98dc Rename some strings examples and commands in documentation
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3224
diff changeset
32 Next we can edit the subrepo data, and push back to Kallithea. This will update
4955
4e6dfdb3fa01 docs: English and consistency corrections
Michael V. DePalatis <mike@depalatis.net>
parents: 4902
diff changeset
33 both of the repositories.
3073
e54ec8211944 added simple subrepos docs
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
34
4902
03bbd33bc084 docs: rework stuff
Mads Kiilerich <madski@unity3d.com>
parents: 4192
diff changeset
35 See http://mercurial.aragost.com/kick-start/en/subrepositories/ for more
03bbd33bc084 docs: rework stuff
Mads Kiilerich <madski@unity3d.com>
parents: 4192
diff changeset
36 information about subrepositories.