From: Joey Hess Date: Sat, 4 Apr 2009 21:27:48 +0000 (-0400) Subject: Merge branch 'master' X-Git-Tag: 3.10~49^2~11 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a;p=ikiwiki.git Merge branch 'master' Conflicts: doc/ikiwiki-makerepo.mdwn --- 8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a diff --cc doc/ikiwiki-makerepo.mdwn index d5034b2c7,9c532f201..3fbfbdc82 --- a/doc/ikiwiki-makerepo.mdwn +++ b/doc/ikiwiki-makerepo.mdwn @@@ -4,28 -4,22 +4,29 @@@ ikiwiki-makerepo - check an ikiwiki src # SYNOPSIS -ikiwiki-makerepo svn|git|monotone srcdir repository +ikiwiki-makerepo svn|git|monotone|darcs srcdir repository - ikiwiki-makerepo mercurial|darcs srcdir -ikiwiki-makerepo bzr|mercurial srcdir ++ikiwiki-makerepo bzr|mercurial|darcs srcdir # DESCRIPTION `ikiwiki-makerepo` injects a `srcdir` directory, containing an ikiwiki wiki, - into a `repository` that it creates. The repository can be a svn, git, or - mercurial repository. + into a `repository` that it creates. The repository can be created using + any of a variety of revision control systems. - Note that for mercurial, the srcdir is converted into a mercurial - repository. There is no need to have a separate repository with mercurial. + Note that for mercurial and bzr, the srcdir is converted into a + repository. There is no need to have a separate repository with mercurial + or bzr. +For darcs, the second (one-argument) form turns the given srcdir into a +darcs master repository with the (new) srcdir inside. Adjust your ikiwiki.setup +according to the command output! Also, the master repo's apply hook will be +preconfigured to call a (hypothetical) ikiwiki wrapper. The command +reports the relevant file. Adjust it as needed or remove it if you don't use +the cgi script. + - Note that for monotone, you are assumed to already have run "mtn genkey" to generate - key. + Note that for monotone, you are assumed to already have run "mtn genkey" -to generate a key. ++to generate key. # AUTHOR