doc updates for bzr
parent
4284719464
commit
e050f35261
|
@ -42,6 +42,11 @@ use IkiWiki::Setup::Standard {
|
||||||
#historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
|
#historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
|
||||||
#diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
|
#diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
|
||||||
|
|
||||||
|
# Bazaar stuff.
|
||||||
|
#rcs => "bzr",
|
||||||
|
#historyurl => ??,
|
||||||
|
#diffurl => ??,
|
||||||
|
|
||||||
# Monotone stuff
|
# Monotone stuff
|
||||||
#rcs => "monotone",
|
#rcs => "monotone",
|
||||||
#mtnkey => "web\@machine.company.com",
|
#mtnkey => "web\@machine.company.com",
|
||||||
|
|
|
@ -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.
|
|
@ -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
|
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
|
user for cleanup. This is less neat than it could be, in that a conflict marked
|
||||||
revision gets committed to the repository.
|
revision gets committed to the repository.
|
||||||
|
|
||||||
|
## [[bzr]]
|
||||||
|
|
|
@ -135,6 +135,13 @@ about using the git repositories.
|
||||||
ikiwiki-makerepo mercurial $SRCDIR
|
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"]]
|
[[toggle id=tla text="TLA"]]
|
||||||
[[toggleable id=tla text="""
|
[[toggleable id=tla text="""
|
||||||
REPOSITORY=~/wikirepo
|
REPOSITORY=~/wikirepo
|
||||||
|
|
|
@ -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
|
> 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
|
> --author and a testsuite to git://git.samba.org/jelmer/ikiwiki.git. I hadn't
|
||||||
> seen this page earlier. --[[jelmer]]
|
> seen this page earlier. --[[jelmer]]
|
||||||
|
|
||||||
|
> I used jelmer's patch --[[done]]! --[[Joey]]
|
||||||
|
|
Loading…
Reference in New Issue