urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into cvs

master
Amitai Schlair 2012-02-07 01:38:53 -05:00
parent cd7eb3e625 b2af77da34
commit 64aca7c30b
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
doc/ikiwiki-makerepo.mdwn
View File

@ -4,19 +4,24 @@ ikiwiki-makerepo - check an ikiwiki srcdir into revision control
# SYNOPSIS # SYNOPSIS
ikiwiki-makerepo git|svn|monotone|darcs|cvs srcdir repository ikiwiki-makerepo git|svn|monotone|darcs|cvs srcdir repo
ikiwiki-makerepo bzr|mercurial srcdir ikiwiki-makerepo bzr|mercurial srcdir
# DESCRIPTION # DESCRIPTION
`ikiwiki-makerepo` injects a `srcdir` directory, containing an ikiwiki wiki, `ikiwiki-makerepo` injects an existing `srcdir` directory, containing
into a `repository` that it creates. The repository can be created using sources for an ikiwiki wiki, into revision control. It is rarely
any of a variety of revision control systems. run directly; consider using `ikiwiki -setup /etc/ikiwiki/wiki.setup` instead
to set up a wiki.
Note that for mercurial and bzr, the srcdir is converted into a For git, the `repo` is created as a bare git repository, and the srcdir is
repository. There is no need to have a separate repository with mercurial made into a clone of it. (monotone and darcs are similar.)
or bzr.
For svn and cvs, the `repo` is the centralized repository, and the `srcdir`
is a checkout of it.
For mercurial and bzr, the srcdir is the only repository set up.
For darcs, the master repo's apply hook will be preconfigured to call a For darcs, the master repo's apply hook will be preconfigured to call a
ikiwiki wrapper. ikiwiki wrapper.
@ -24,13 +29,13 @@ ikiwiki wrapper.
Note that for monotone, you are assumed to already have run "mtn genkey" Note that for monotone, you are assumed to already have run "mtn genkey"
to generate a key. to generate a key.
# EXAMPLE # EXAMPLE
`ikiwiki-makerepo git /var/www/wiki /home/user/wiki/` `ikiwiki-makerepo git /srv/web/wiki /srv/git/wiki.git/`
The above command creates a new git repo in /home/user/wiki as well as a new git repo in the /var/www/wiki directory. This creates a bare repository `/srv/git/wiki.git/`,
It then initializes the /home/user/wiki git repo and makes the /var/www/wiki a clone. and sets up `/srv/web/wiki` to be a clone of it, committing
any files that already exist in that directory.
# AUTHOR # AUTHOR

2
doc/sandbox.mdwn
View File

@ -171,3 +171,5 @@ endmodule
#<asd> #<asd>
This is simple enough for now [[sandbocen]] no? This is simple enough for now [[sandbocen]] no?
Do code tags work?