diff options
| -rw-r--r-- | doc/ikiwiki.setup | 5 | ||||
| -rw-r--r-- | doc/rcs/bzr.mdwn | 8 | ||||
| -rw-r--r-- | doc/rcs/details.mdwn | 2 | ||||
| -rw-r--r-- | doc/setup.mdwn | 7 | ||||
| -rw-r--r-- | doc/todo/bzr.mdwn | 2 |
5 files changed, 24 insertions, 0 deletions
diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup index 9bf542981..e2974cfd5 100644 --- a/doc/ikiwiki.setup +++ b/doc/ikiwiki.setup @@ -42,6 +42,11 @@ use IkiWiki::Setup::Standard { #historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository #diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]", + # Bazaar stuff. + #rcs => "bzr", + #historyurl => ??, + #diffurl => ??, + # Monotone stuff #rcs => "monotone", #mtnkey => "web\@machine.company.com", diff --git a/doc/rcs/bzr.mdwn b/doc/rcs/bzr.mdwn new file mode 100644 index 000000000..19a7ae395 --- /dev/null +++ b/doc/rcs/bzr.mdwn @@ -0,0 +1,8 @@ +[Bazaar](http://bazaar-vcs.org/) is a distributed revison control +system developed by Canonical Ltd. Ikiwiki supports storing a wiki in a +bzr repository. + +Ikiwiki can run as a post-update hook to update a wiki whenever commits +come in. When running as a [[cgi]] with bzr, ikiwiki automatically +commits edited pages, and uses the bzr history to generate the +[[RecentChanges]] page. diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn index 6b9ffb91f..449e129bd 100644 --- a/doc/rcs/details.mdwn +++ b/doc/rcs/details.mdwn @@ -352,3 +352,5 @@ merge again with a merger that inserts conflict markers. It commits this new revision with conflict markers to the repository. It then returns the text to the user for cleanup. This is less neat than it could be, in that a conflict marked revision gets committed to the repository. + +## [[bzr]] diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 9bf7f7c7b..857a9dbae 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -135,6 +135,13 @@ about using the git repositories. ikiwiki-makerepo mercurial $SRCDIR """]] +[[toggle id=mercurial text="Bazaar"]] +[[toggleable id=bazaar text=""" + REPOSITORY=$SRCDIR + # FIXME: doesn't work yet with bzr + ikiwiki-makerepo bzr $SRCDIR +"""]] + [[toggle id=tla text="TLA"]] [[toggleable id=tla text=""" REPOSITORY=~/wikirepo diff --git a/doc/todo/bzr.mdwn b/doc/todo/bzr.mdwn index 51ae08146..179ea2f24 100644 --- a/doc/todo/bzr.mdwn +++ b/doc/todo/bzr.mdwn @@ -190,3 +190,5 @@ and rcs_getctime and rcs_notify aren't written at all. --[[bma]] > I've just posted another patch with support for bzr, including support for > --author and a testsuite to git://git.samba.org/jelmer/ikiwiki.git. I hadn't > seen this page earlier. --[[jelmer]] + +> I used jelmer's patch --[[done]]! --[[Joey]] |