diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | doc/ikiwiki-makerepo.mdwn | 15 | ||||
| -rwxr-xr-x | ikiwiki-makerepo | 4 |
3 files changed, 17 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 07062b04a..26e22aa94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.01) UNRELEASED; urgency=low + + * ikiwiki-makerepo: Fix injecting of empty mercurial and bzr repositories. + Closes: #510518 + + -- Joey Hess <joeyh@debian.org> Fri, 02 Jan 2009 14:12:16 -0500 + ikiwiki (3.00) unstable; urgency=low * Remove support for GlobLists. diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn index dcebbb96a..9c532f201 100644 --- a/doc/ikiwiki-makerepo.mdwn +++ b/doc/ikiwiki-makerepo.mdwn @@ -6,19 +6,20 @@ ikiwiki-makerepo - check an ikiwiki srcdir into revision control ikiwiki-makerepo svn|git|monotone srcdir repository -ikiwiki-makerepo mercurial srcdir +ikiwiki-makerepo bzr|mercurial 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. -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. # AUTHOR diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo index c3d835c30..32a9f8646 100755 --- a/ikiwiki-makerepo +++ b/ikiwiki-makerepo @@ -75,7 +75,7 @@ mercurial) hg init "$srcdir" cd "$srcdir" echo .ikiwiki > .hgignore - hg add * .hgignore + hg add hg commit -m "initial import" echo "Directory $srcdir is now set up as a mercurial repository" ;; @@ -83,7 +83,7 @@ bzr) bzr init "$srcdir" cd "$srcdir" echo .ikiwiki > .bzrignore - bzr add * .bzrignore + bzr add bzr commit -m "initial import" echo "Directory $srcdir is now set up as a bzr repository" ;; |